diff --git a/Gemfile b/Gemfile index 54b813cbe..6250d0438 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'acts_as_votable', '~> 0.11.1' gem 'ahoy_matey', '~> 1.6.0' gem 'ancestry', '~> 3.0.1' gem 'browser', '~> 2.5.2' -gem 'cancancan', '~> 1.16.0' +gem 'cancancan', '~> 2.1.2' gem 'ckeditor', '~> 4.2.3' gem 'cocoon', '~> 1.2.9' gem 'coffee-rails', '~> 4.2.1' diff --git a/Gemfile.lock b/Gemfile.lock index 76c3824d5..926428c6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.10.0) byebug (9.1.0) - cancancan (1.16.0) + cancancan (2.1.2) capistrano (3.10.1) airbrussh (>= 1.0.0) i18n @@ -499,7 +499,7 @@ DEPENDENCIES browser (~> 2.5.2) bullet (~> 5.7.0) byebug (~> 9.1.0) - cancancan (~> 1.16.0) + cancancan (~> 2.1.2) capistrano (~> 3.10.1) capistrano-bundler (~> 1.2) capistrano-rails (~> 1.3.1)