Merge pull request #16760 from code-dot-org/revert-16737-upgradeCanCa…

…nCan Revert "Upgrade cancancan from 1.15.0 to 2.0."
code-dot-org · Aug 1, 2017 · 2215c42 · 2215c42
2 parents 9687f4b + 8372c47
commit 2215c42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -132,7 +132,7 @@ gem 'gemoji'
 gem 'jbuilder', '~> 2.5'
 
 # Authentication and permissions.
-gem 'cancancan', '~> 2.0'
+gem 'cancancan', '~> 1.15.0'
 gem 'devise', '~> 4.2.0'
 gem 'devise_invitable', '~> 1.6.0'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -206,7 +206,7 @@ GEM
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
     builder (3.2.2)
-    cancancan (2.0.0)
+    cancancan (1.15.0)
     capybara (2.14.0)
       addressable
       mime-types (>= 1.16)
@@ -741,7 +741,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-sass (~> 2.3.2.2)
-  cancancan (~> 2.0)
+  cancancan (~> 1.15.0)
   chromedriver-helper (~> 0.0.7)
   chronic (~> 0.10.2)
   codecov