From c281c67d0e6f76b64efab02c1264fffa9dfa8567 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sun, 3 Jan 2021 09:58:04 +0000
Subject: [PATCH] Switch from cancan to cancancan

Development of cancan stopped in 2013. cancancan is the active fork of the defunct original, and has been updated many times to keep up with changes in newer Rails and Ruby versions.
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d1263a0ffe..5aef8d739c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9e265b326d..821eefc550 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
@@ -737,7 +737,7 @@ DEPENDENCIES
   aws-sdk (= 1.67.0)
   bugsnag
   byebug
-  cancan (~> 1.6.10)
+  cancancan (~> 1.7.0)
   capybara
   catalog!
   coffee-rails (~> 4.2.2)