From 4a07f494199d1746fd08bbc790c8468b1b728878 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@stembolt.com>
Date: Mon, 7 May 2018 13:57:19 -0700
Subject: [PATCH] Upgrade cancancan to 2.x

---
 core/solidus_core.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec
index 426e78024bd..e4abee7c3ab 100644
--- a/core/solidus_core.gemspec
+++ b/core/solidus_core.gemspec
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activemerchant', '~> 1.66'
   s.add_dependency 'acts_as_list', '~> 0.3'
   s.add_dependency 'awesome_nested_set', '~> 3.0', '>= 3.0.1'
-  s.add_dependency 'cancancan', '~> 1.10'
+  s.add_dependency 'cancancan', '~> 2.2'
   s.add_dependency 'carmen', '~> 1.1.0'
   s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'