diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-03-03 20:32:18 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-03-03 20:32:18 -0500 |
| commit | 71a2303567c6295a6ee64357d90408b91e0079c4 (patch) | |
| tree | aefa631ed40480ee4f5262a7af7e55943465f34f | |
| parent | e1bc808746523309476913033b104345c06c4816 (diff) | |
| download | gitlab-ce-issue_2805.tar.gz | |
Upgrade carrierwave to 0.10.0.issue_2805
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index e048e2f5a56..07f069c9215 100644 --- a/Gemfile.lock +++ b/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) |