diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-05 14:48:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-05 14:48:36 +0000 |
| commit | 28bee175dbdba8bb0ca04887d6f8d5c4d727a0bd (patch) | |
| tree | 75b78a37b2059472a6e5e65fd5affef01cf64a14 /Gemfile | |
| parent | 14df110b78e0fb7f6e45fff5e4ce65ef2d91ea60 (diff) | |
| parent | 71a2303567c6295a6ee64357d90408b91e0079c4 (diff) | |
| download | gitlab-ce-28bee175dbdba8bb0ca04887d6f8d5c4d727a0bd.tar.gz | |
Merge branch 'issue_2805' into 'master'
Upgrade carrierwave to 0.10.0.
Closes #2805
See merge request !3084
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 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' |