Merge 932b14f into 94971e1

SpotswoodCollege · Apr 3, 2019 · 8ab39ca · 8ab39ca
2 parents 94971e1 + 932b14f
commit 8ab39ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -62,7 +62,7 @@ end
 gem 'devise'
 
 # Use CanCanCan for roles and permissions
-gem 'cancancan', '~> 2.3'
+gem 'cancancan', '~> 3.0'
 
 # Use Letter Opener for development mail previews
 gem 'letter_opener', group: :development

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
     bindex (0.5.0)
     builder (3.2.3)
     byebug (10.0.2)
-    cancancan (2.3.0)
+    cancancan (3.0.0)
     capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -252,7 +252,7 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
-  cancancan (~> 2.3)
+  cancancan (~> 3.0)
   capybara (~> 3.12)
   coffee-rails (~> 4.2)
   coveralls