Skip to content

Commit

Permalink
Merge pull request #3481 from akostadinov/cancancan
Browse files Browse the repository at this point in the history
upgrade cancancan to a version supporting Rails 6
  • Loading branch information
akostadinov authored Jul 20, 2023
2 parents a62e46f + 96a7006 commit 1aaa603
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ gem 'stripe', '~> 5.28.0' # we need the stripe gem because activemerchant can no
gem 'acts_as_list', '~> 0.9.17'
gem 'braintree', '~> 2.93'
gem 'bugsnag', '~> 6.11'
gem 'cancancan', '~> 2.3.0'
gem 'cancancan', '~> 3.0.0'
gem 'formtastic', '~> 4.0'
gem 'htmlentities', '~>4.3', '>= 4.3.4'
# TODO: Not actively maintained https://github.com/activeadmin/inherited_resources#notice replace with respond_with and fix things the rails way
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
cancancan (2.3.0)
cancancan (3.0.2)
capybara (3.35.3)
addressable
mini_mime (>= 0.1.3)
Expand Down Expand Up @@ -917,7 +917,7 @@ DEPENDENCIES
browser (~> 5.0.0)
bugsnag (~> 6.11)
bullet (~> 6.1.5)
cancancan (~> 2.3.0)
cancancan (~> 3.0.0)
capybara (~> 3.35.3)!
childprocess
chronic
Expand Down

0 comments on commit 1aaa603

Please sign in to comment.