From 47c99207f43400375c09254cf59895ba99ace50a Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sat, 7 Apr 2018 23:17:21 +0200
Subject: [PATCH] Bump carrierwave

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

diff --git a/Gemfile b/Gemfile
index 1e917b44b..b5c85450f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -77,7 +77,7 @@ gem "activerecord-import", "0.22.0"
 
 # File uploading
 
-gem "carrierwave", "1.1.0"
+gem "carrierwave", "1.2.2"
 gem "fog-aws",     "1.4.1"
 gem "mini_magick", "4.8.0"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f4aed0be5..cd009881e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (1.1.0)
+    carrierwave (1.2.2)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
@@ -775,7 +775,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.3.7)
   bootstrap-switch-rails (= 3.3.3)
   capybara (= 2.15.1)
-  carrierwave (= 1.1.0)
+  carrierwave (= 1.2.2)
   compass-rails (= 3.0.2)
   configurate (= 0.3.1)
   coveralls (= 0.8.21)