Commit graph

77 commits

Author SHA1 Message Date
Connor Turland 6715ba7e7f not a function 2016-03-14 11:03:11 +11:00
Connor Turland 604087c592 Merge branch 'develop' into feature/realtime.video 2016-03-14 10:45:16 +11:00
Connor Turland 77d69dd2a3 turns out we do need delayed_job 2016-03-13 11:56:18 +11:00
Connor Turland 11e57c1b37 rebase onto develop which now has API and pundit 2016-03-13 10:36:38 +11:00
Connor Turland 669b337d04 changes for api 2016-03-12 09:37:18 +11:00
Connor Turland e6017c4129 Merge remote-tracking branch 'origin/feature/pundit' into feature/api.pundit 2016-03-12 07:19:19 +11:00
Connor Turland 059591b78b first pass at important API endpoints, token auth 2016-03-11 17:16:04 +11:00
Connor Turland c6fea78054 merge develop 2016-02-29 13:58:47 +13:00
Devin Howard 66f1d2ec0b install pundit 2016-02-28 12:30:41 +08:00
Devin Howard 295534e4ab migrate to using aws/paperclip for metacodes. RUN RAKE TASK ON PRODUCTION 2016-02-23 14:58:20 +08:00
Devin Howard 7956e6d289 check map#contains matches json schema in spec 2016-02-09 11:20:39 +08:00
Devin Howard 80a6bcbca2 remove annoying rcov gem 2016-02-08 11:19:40 +08:00
Devin Howard b3f8f6652a simplecov added 2016-02-08 11:19:36 +08:00
Connor Turland 5d838303a8 broken gemfile.lock and pass recent migrations 2016-01-22 16:14:35 +13:00
Connor Turland 4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard b3ba6d3a80 add shoulda-matchers gem 2015-12-17 08:53:45 +08:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Devin Howard 1597665be5 merge develop with rails4 stuff 2015-12-07 13:58:42 +08:00
Devin Howard fa67ec0444 update Gemfile for rails 4 2015-12-03 17:14:04 -05:00
Devin Howard d3814708a9 gc tuning 2015-12-03 16:58:20 -05:00
Devin Howard 9575a62e67 add .ruby-gemset file - you may need to reinstall gems if using rvm 2015-12-03 16:58:20 -05:00
Connor Turland dcbe24bb7e getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-12-03 16:57:30 -05:00
Devin Howard 506f93e144 Gemfile.lock 2015-12-03 16:57:29 -05:00
Devin Howard 60898fadb2 binding_of_caller gem for devel debug 2015-12-03 16:57:27 -05:00
Devin Howard 5b882b1332 pry byebug 2015-12-03 16:57:25 -05:00
Connor Turland 1a01d3b568 configuration for production environments like heroku 2015-12-03 16:57:23 -05:00
Connor Turland 8b7ec73f48 this enables the vagrant port forwarding 2015-12-03 16:57:23 -05:00
Devin Howard 95e1806500 cancan => cancancan 2015-12-03 16:57:23 -05:00
Devin Howard d4f72bac65 whoo new gems for development. binding.pry is so cool 2015-12-03 16:57:22 -05:00
Devin Howard 7b199983d8 add jquery_ui to gemfile 2015-12-03 16:57:22 -05:00
Devin Howard 562dd17b36 update Gemfile for rails 4 2015-12-03 16:57:21 -05:00
Devin Howard 45e09a27bd gc tuning 2015-11-25 11:59:56 +08:00
Devin Howard d3d0c97e7e add .ruby-gemset file - you may need to reinstall gems if using rvm 2015-11-23 18:22:34 +08:00
Connor Turland 1bbaa47b80 getting uploads working
followed what it said to do here: http://stackoverflow.com/questions/28374401/nameerror-uninitialized-constant-paperclipstorages3aws
2015-11-07 01:33:18 +08:00
Devin Howard 5b4bd9724b Gemfile.lock 2015-11-02 00:06:12 +08:00
Devin Howard 6f518be51d rspec tests rails4 Gemfile.lock 2015-10-27 18:23:25 +08:00
Devin Howard 3440826d51 binding_of_caller gem for devel debug 2015-10-26 11:53:50 +08:00
Devin Howard dc66ac10a9 pry byebug 2015-10-23 22:27:33 +08:00
Devin Howard 0d2ddbd9b6 add rspec to Gemfile 2015-10-12 11:24:30 +08:00
Devin Howard c0d29e54bd Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4 2015-09-28 14:43:16 +08:00
Devin Howard 741c584651 Merge branch 'develop' into rails4 2015-09-20 13:55:21 +08:00
Connor Turland f5dbfd5d72 configuration for production environments like heroku 2015-09-19 14:10:43 -04:00
Connor Turland 869fb816e9 this enables the vagrant port forwarding 2015-09-19 13:16:07 -04:00
Devin Howard b2e15c6483 cancan => cancancan 2015-09-19 20:25:07 +08:00
Devin Howard 1aa4d862a1 whoo new gems for development. binding.pry is so cool 2015-09-19 17:01:27 +08:00
Devin Howard 8cf8277573 add jquery_ui to gemfile 2015-09-10 22:13:10 +08:00
Devin Howard 5848af7765 update Gemfile for rails 4 2015-09-10 17:43:48 +08:00
mix irving 7a1b68960d install dotenv to help managed env vars 2015-03-09 08:50:24 +13:00
Connor Turland 951bd8d4a5 removed sidekiq leftovers. altered synapse results to only return unique 2014-11-16 12:35:06 -05:00
Connor Turland 47132f3e60 ruby 2.1 2014-10-08 01:21:02 -04:00