diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-12-26 23:02:18 -0700 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2017-01-04 12:28:32 -0700 |
| commit | ccf1dc330c6e6a14c2a1e2e066644aa73fecedd9 (patch) | |
| tree | dde41837166434199b140cec41dcf78f8152ae43 | |
| parent | 7c2a4699b8bdd9d8abd193e4256694115b41fc07 (diff) | |
| download | gitlab-ce-cs-update-carrierwave.tar.gz | |
Update Carrierwave from 0.10.0 to 1.0.0.cs-update-carrierwave
This is required for Rails 5.
Changelog: https://github.com/carrierwaveuploader/carrierwave/blob/9ef68325dd5ea465b4d340af9a9def10934cd677/CHANGELOG.md#100---2016-12-24
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 |
2 files changed, 5 insertions, 6 deletions
@@ -78,7 +78,7 @@ gem 'kaminari', '~> 0.17.0' gem 'hamlit', '~> 2.6.1' # Files attachments -gem 'carrierwave', '~> 0.10.0' +gem 'carrierwave', '~> 1.0.0' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' diff --git a/Gemfile.lock b/Gemfile.lock index 5dcf3744d99..d035b9ae6b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,10 +102,9 @@ GEM capybara-screenshot (1.0.11) capybara (>= 1.0, < 3) launchy - carrierwave (0.10.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) + carrierwave (1.0.0) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) charlock_holmes (0.7.3) @@ -823,7 +822,7 @@ DEPENDENCIES bundler-audit (~> 0.5.0) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) + carrierwave (~> 1.0.0) charlock_holmes (~> 0.7.3) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) |