glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/realtime.video

Browse source
This commit is contained in:
Connor Turland 2016-03-14 21:45:36 +11:00
commit f055f4c7c5
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -7,6 +7,7 @@ gem 'devise'
gem 'redis' gem 'redis'
gem 'pg' gem 'pg'
gem 'pundit' gem 'pundit'
gem 'cancan'
gem 'pundit_extra' gem 'pundit_extra'
gem 'formula' gem 'formula'
gem 'formtastic' gem 'formtastic'

5
Gemfile.lock
View file

@ -57,6 +57,7 @@ GEM
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
builder (3.2.2) builder (3.2.2)
byebug (8.2.2) byebug (8.2.2)
cancan (1.6.10)
cancancan (1.10.1) cancancan (1.10.1)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
@ -264,6 +265,7 @@ DEPENDENCIES
best_in_place best_in_place
better_errors better_errors
binding_of_caller binding_of_caller
cancan
coffee-rails coffee-rails
delayed_job (~> 4.0.2) delayed_job (~> 4.0.2)
delayed_job_active_record (~> 4.0.1) delayed_job_active_record (~> 4.0.1)
@ -299,3 +301,6 @@ DEPENDENCIES
tunemygc tunemygc
uglifier uglifier
uservoice-ruby uservoice-ruby
BUNDLED WITH
1.11.2