diff --git a/Gemfile b/Gemfile index 5eb0d839..7b39be5e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '4.2.4' 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 62c0a085..16ea23f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM erubis (>= 2.6.6) rack (>= 0.9.0) builder (3.2.2) - cancan (1.6.10) + cancancan (1.12.0) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.7) @@ -196,7 +196,7 @@ DEPENDENCIES aws-sdk best_in_place better_errors - cancan + cancancan coffee-rails devise dotenv