From f899bea5436f3402558daf571228ed87077e5fdc Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 11 Sep 2019 17:34:57 +0300 Subject: [PATCH] Update `cancancan` gem --- Gemfile | 4 +--- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 59882bed6e..e8e3007082 100644 --- a/Gemfile +++ b/Gemfile @@ -44,9 +44,7 @@ gem 'selectize-rails', '0.12.1' # include selectize.js for select gem 'kaminari', '0.16.3' # pagination gem 'coderay', '1.1.0' # xml console visualize gem 'select2-rails', '3.5.9.3' # for autocomplete - -# rights -gem 'cancancan', '1.11.0' # autharization +gem 'cancancan' gem 'devise', '~> 4.0' gem 'grape' diff --git a/Gemfile.lock b/Gemfile.lock index 45ceca8aba..cdb1aa6477 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,7 +131,7 @@ GEM bullet (4.14.7) activesupport (>= 3.0.0) uniform_notifier (~> 1.9.0) - cancancan (1.11.0) + cancancan (3.0.1) capybara (3.22.0) addressable mini_mime (>= 0.1.3) @@ -464,7 +464,7 @@ DEPENDENCIES autodoc bootstrap-sass (~> 3.4) bullet (= 4.14.7) - cancancan (= 1.11.0) + cancancan capybara coderay (= 1.1.0) coffee-rails (= 4.1.0)