DRSNJM / board-ultimatum

Board game recommendation web app using the board ultimatum library.
board-ultimatum.herokuapp.com
2 stars 0 forks source link

Expert auth #1

Closed RyanMcG closed 12 years ago

RyanMcG commented 12 years ago

These commits implement the following features:

RyanMcG commented 12 years ago

If someone has any thoughts or wants me to hold off on merging this let me know. Also, some CR would be fun if anyone is into that. It has to be merged manually since people have been working on master directly which I can do when I get the green light.

RyanMcG commented 12 years ago

After merging locally I found that the only two conflicts are with bootstrap.min.css and model.clj. They are both easy fixes. The former should not have been necessary, but a bad commit (ceb687b) was made. The latter was easily resolved by using my version of ensure-indices and adding the two functions I put in the model.