Merge pull request #1300 from internetee/update-cancancan-gem

Update `cancancan` gem
This commit is contained in:
Timo Võhmar 2019-09-13 14:19:22 +03:00 committed by GitHub
commit d9ab4e1150
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View file

@ -44,9 +44,7 @@ gem 'selectize-rails', '0.12.1' # include selectize.js for select
gem 'kaminari', '0.16.3' # pagination gem 'kaminari', '0.16.3' # pagination
gem 'coderay', '1.1.0' # xml console visualize gem 'coderay', '1.1.0' # xml console visualize
gem 'select2-rails', '3.5.9.3' # for autocomplete gem 'select2-rails', '3.5.9.3' # for autocomplete
gem 'cancancan'
# rights
gem 'cancancan', '1.11.0' # autharization
gem 'devise', '~> 4.0' gem 'devise', '~> 4.0'
gem 'grape' gem 'grape'

View file

@ -132,7 +132,7 @@ GEM
bullet (4.14.7) bullet (4.14.7)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0) uniform_notifier (~> 1.9.0)
cancancan (1.11.0) cancancan (3.0.1)
capybara (3.22.0) capybara (3.22.0)
addressable addressable
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
@ -466,7 +466,7 @@ DEPENDENCIES
autodoc autodoc
bootstrap-sass (~> 3.4) bootstrap-sass (~> 3.4)
bullet (= 4.14.7) bullet (= 4.14.7)
cancancan (= 1.11.0) cancancan
capybara capybara
coderay (= 1.1.0) coderay (= 1.1.0)
coffee-rails (= 4.1.0) coffee-rails (= 4.1.0)