Merge 9454e29 into b585e29

openmensa · Sep 28, 2019 · 5b39394 · 5b39394
2 parents b585e29 + 9454e29
commit 5b39394
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ gem 'oj'
 gem 'pg', '~> 1.0'
 gem 'slim'
 
-gem 'cancancan', '~> 2.0'
+gem 'cancancan', '~> 3.0'
 gem 'omniauth'
 gem 'omniauth-facebook'
 gem 'omniauth-github'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -63,7 +63,7 @@ GEM
     brakeman (4.6.1)
     builder (3.2.3)
     byebug (11.0.1)
-    cancancan (2.3.0)
+    cancancan (3.0.1)
     cany (0.5.7)
     capybara (3.29.0)
       addressable
@@ -397,7 +397,7 @@ DEPENDENCIES
   bcrypt
   bourbon (~> 6.0)
   brakeman
-  cancancan (~> 2.0)
+  cancancan (~> 3.0)
   cany (~> 0.5.0)
   capybara
   coffee-rails (~> 4.2.0)