Merge branch 'issue_2805' into 'master'

Upgrade carrierwave to 0.10.0.

Closes #2805 

See merge request !3084

Former-commit-id: 28bee175

Gemfile

@@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
 gem "haml-rails", '~> 0.9.0'
 # Files attachments
-gem "carrierwave", '~> 0.9.0'
+gem "carrierwave", '~> 0.10.0'
 # Image editing
 gem "mini_magick", '~> 4.4.0'

Gemfile.lock

@@ -117,10 +117,11 @@ GEM
     capybara-screenshot (1.0.11)
       capybara (>= 1.0, < 3)
       launchy
-    carrierwave (0.9.0)
+    carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
+      mime-types (>= 1.16)
     cause (0.1)
     charlock_holmes (0.7.3)
     chunky_png (1.3.5)
@@ -898,7 +899,7 @@ DEPENDENCIES
   cal-heatmap-rails (~> 3.5.0)
   capybara (~> 2.4.0)
   capybara-screenshot (~> 1.0.0)
-  carrierwave (~> 0.9.0)
+  carrierwave (~> 0.10.0)
   charlock_holmes (~> 0.7.3)
   coffee-rails (~> 4.1.0)
   colorize (~> 0.7.0)