Skip to content

Commit

Permalink
Merge pull request #1300 from internetee/update-cancancan-gem
Browse files Browse the repository at this point in the history
Update `cancancan` gem
  • Loading branch information
vohmar authored Sep 13, 2019
2 parents 51aa3bc + f899bea commit d9ab4e1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d9ab4e1

Please sign in to comment.