diff --git a/Gemfile b/Gemfile index 836fce72f9..0a69b58d65 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 badb5a81b2..ac53ec1029 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,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) @@ -466,7 +466,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)