diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-09-27 18:45:39 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-09-27 19:59:05 -0600 |
| commit | 623bcad9e6abc604536a8be60cea41c486d6fd17 (patch) | |
| tree | 70f6f7101bdfea7c95667872ea36e652fcba258e | |
| parent | 3b206ccb8393d8f2c5ad227874d9a60beb054782 (diff) | |
| download | gitlab-ce-cs-test-carrierwave-1-0-0.tar.gz | |
Update carrierwave to 1.0.0.beta for testing.cs-test-carrierwave-1-0-0
| -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.beta' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' diff --git a/Gemfile.lock b/Gemfile.lock index 1691f92c8ce..f767276383b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,10 +121,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.beta) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) charlock_holmes (0.7.3) @@ -825,7 +824,7 @@ DEPENDENCIES byebug (~> 8.2.1) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) - carrierwave (~> 0.10.0) + carrierwave (= 1.0.0.beta) charlock_holmes (~> 0.7.3) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) |