diff options
| author | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 12:34:58 +0300 |
|---|---|---|
| committer | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 12:34:58 +0300 |
| commit | 95f63bca5ac5c23b538e36f0a12fbbe4520cb318 (patch) | |
| tree | 143e9402a3b5cbacceff540ab99c1e12713a3de8 /Gemfile.lock | |
| parent | 03f0f2566b3c536cf512b287e0d4d52d40a065c5 (diff) | |
| parent | 957167f3040ac3126ab22e3771b44738ac7601c5 (diff) | |
Merge branch 'bump-carrierwave-to-1-2-3' into 'master'
Bump Carrierwave gem to 1.2.3 (which contains the monkey patch for memory consumption)
Closes #46182
See merge request gitlab-org/gitlab-ce!20287
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a4784cc6499..d8fa52a0e55 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM capybara-screenshot (1.0.14) capybara (>= 1.0, < 3) launchy - carrierwave (1.2.1) + carrierwave (1.2.3) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) |