From f87f8b6857ab235acd2f06cc7e457e21549090b1 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <depfu[bot]@users.noreply.github.com>
Date: Sun, 7 Jan 2018 00:20:42 +0000
Subject: [PATCH] Upgrade cancancan to version 2.1.2

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index cba81dc51..3f4bd8b1b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'acts_as_votable', '~> 0.11.1'
 gem 'ahoy_matey', '~> 1.6.0'
 gem 'ancestry', '~> 2.2.2'
 gem 'browser', '~> 2.5.2'
-gem 'cancancan', '~> 1.16.0'
+gem 'cancancan', '~> 2.1.2'
 gem 'ckeditor', '~> 4.2.3'
 gem 'cocoon', '~> 1.2.9'
 gem 'coffee-rails', '~> 4.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index d4ff03fcf..adfe46aea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
     byebug (9.1.0)
-    cancancan (1.16.0)
+    cancancan (2.1.2)
     capistrano (3.10.1)
       airbrussh (>= 1.0.0)
       i18n
@@ -499,7 +499,7 @@ DEPENDENCIES
   browser (~> 2.5.2)
   bullet (~> 5.7.0)
   byebug (~> 9.1.0)
-  cancancan (~> 1.16.0)
+  cancancan (~> 2.1.2)
   capistrano (~> 3.10.1)
   capistrano-bundler (~> 1.2)
   capistrano-rails (~> 1.3.1)