Commit a650357e authored by Mario Manno's avatar Mario Manno

upgrade to cancancan

parent 1ad5517d
......@@ -10,7 +10,7 @@ gem 'acts_as_commentable'
gem 'acts_as_indexed'
gem 'barista'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'cancan'
gem 'cancancan'
gem 'cocoon'
gem 'formtastic', '~> 2.1.0'
gem 'formtastic-bootstrap', :git => "git://github.com/frab/formtastic-bootstrap.git"
......
......@@ -67,7 +67,7 @@ GEM
byebug (2.7.0)
columnize (~> 0.3)
debugger-linecache (~> 1.2)
cancan (1.6.10)
cancancan (1.12.0)
celluloid (0.15.2)
timers (~> 1.1.0)
climate_control (0.0.3)
......@@ -227,7 +227,7 @@ DEPENDENCIES
barista
bcrypt-ruby (~> 3.0.0)
bullet
cancan
cancancan
cocoon
coffee-rails (~> 3.2.0)
factory_girl_rails (~> 4.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment