raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6597 from Matt-Yorkley/cancancan

Browse Source 
Switch from cancan to cancancan
This commit is contained in:
Matt-Yorkley
2021-01-08 17:15:08 +01:00
committed by GitHub
parent 6e689c4607 c281c67d0e
commit 0949e72c88
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -23,7 +23,7 @@ gem 'pg', '~> 0.21.0'
gem 'acts_as_list', '0.9.19'
gem 'awesome_nested_set', '~> 3.3.1'
gem 'cancan', '~> 1.6.10'
gem 'cancancan', '~> 1.7.0'
gem 'ffaker'
gem 'highline', '2.0.3' # Necessary for the install generator
gem 'json'

4
Gemfile.lock
View File

@@ -131,7 +131,7 @@ GEM
concurrent-ruby (~> 1.0)
builder (3.2.4)
byebug (11.1.3)
cancan (1.6.10)
cancancan (1.7.1)
capybara (3.32.2)
addressable
mini_mime (>= 0.1.3)
@@ -747,7 +747,7 @@ DEPENDENCIES
aws-sdk (= 1.67.0)
bugsnag
byebug
cancan (~> 1.6.10)
cancancan (~> 1.7.0)
capybara
catalog!
coffee-rails (~> 4.2.2)