Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cancancan gem #1300

Merged
merged 1 commit into from
Sep 13, 2019
Merged

Update cancancan gem #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Gemfile
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down