diff --git a/Gemfile b/Gemfile index e21cca7e..da4d92e6 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'rails', '3.2.17' gem 'devise' gem 'redis' gem 'pg' -gem 'cancan' +gem 'cancancan' gem 'formula' gem 'formtastic' gem 'json' diff --git a/Gemfile.lock b/Gemfile.lock index e46dfc6b..f52a8ccb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM jquery-rails rails (~> 3.1) builder (3.0.4) - cancan (1.6.10) + cancancan (1.10.1) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.4) @@ -162,7 +162,7 @@ PLATFORMS DEPENDENCIES aws-sdk best_in_place - cancan + cancancan coffee-rails (~> 3.2.1) devise formtastic