Graham Kaplan
3d9650f531
Fix gemfile for openshift
2014-05-17 16:31:10 -07:00
Graham Kaplan
a2f2f630a4
Add OpenShift hooks
2014-05-17 13:34:42 -07:00
Graham Kaplan
3759910993
Forgot to fix conflicts, oops
2014-04-05 19:33:22 -07:00
Graham Kaplan
abaf5b55a4
Merge branch 'master' of https://github.com/bikebike/BikeBike
...
Conflicts:
Gemfile
Gemfile.lock
2014-04-05 19:27:05 -07:00
Graham Kaplan
230295790b
Add Facebook login with Sorcery
...
The facebook key and secret defined in the sorcery config file are for
testing only and need to be changed and not committed to source when
app is ready to go live
2014-04-05 19:18:57 -07:00
Graham Kaplan
a6da30dc08
Needed to comment this out to get app working
2014-04-05 19:17:19 -07:00
Graham Kaplan
c9a09de740
Add flash message display
2014-04-05 19:16:15 -07:00
Graham Kaplan
ab42618bbd
Add rails-footnotes to make development debugging easier
2014-04-05 19:15:37 -07:00
Graham Kaplan