merge feature in progress - #32

Open

rmtolmach wants to merge 17 commits into

Ada-C4:masterfrom

rmtolmach:master

Commits on Mar 28, 2016

tests passing. deployed to heroku
rmtolmach
committed
5cb468e
wrote a failing test
rmtolmach
committed
f7c211d
new category page showing and saving games with valid names
rmtolmach
committed
034d0f2
test I wrote is now passing
rmtolmach
committed
afb7d1b

Commits on Mar 29, 2016

fixed bug preventing the ability to edit
rmtolmach
committed
18692f5
delete db files
rmtolmach
committed
3a368c1
update gitignore
rmtolmach
committed
ccfa96a
added conditional in new_or_edit method
rmtolmach
committed
e0f0bac
test checks whether the correct template is rendered
rmtolmach
committed
02b80b7
refactored ternary operator
rmtolmach
committed
32c44d4
write features for merge article
rmtolmach
committed
4bc3d9b
re-wrote features to be more testable. maybe
rmtolmach
committed
a9f48b2
write steps and changed up features
rmtolmach
committed
9e2b742

Commits on Mar 30, 2016

reworking cucumber tests
rmtolmach
committed
1fff834
more cucumber changes
rmtolmach
committed
262f6e3
deleted commented out stuff
rmtolmach
committed
0ab7144

Commits on Mar 31, 2016

merge action in controller
rmtolmach
committed
384beb9