From 9cf671b341fce2416e7f1bc6d620a8fb86e5a211 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Tue, 27 Dec 2016 11:43:32 +0100
Subject: Gem carrierwave

---
 Gemfile      | 1 +
 Gemfile.lock | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 8e7968be3..02521c153 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,6 +119,7 @@ gem 'acts_as_list', '~> 0.6.0'
 gem 'acts_as_tree', '~> 2.1.0', require: 'acts_as_tree'
 
 gem 'rabl'
+gem 'carrierwave', '~> 1.0'
 
 gem 'sidekiq'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4e07a585a..567ce2982 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,6 +115,10 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    carrierwave (1.0.0)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
+      mime-types (>= 1.16)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     choice (0.1.7)
@@ -598,6 +602,7 @@ DEPENDENCIES
   capistrano-ext
   capistrano-npm
   capybara (~> 2.4.0)
+  carrierwave (~> 1.0)
   cocoon
   codifligne!
   coffee-rails (~> 4.0.0)
-- 
cgit v1.2.3