diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-01-09 22:07:51 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-09 22:07:51 +0000 |
commit | 928d974a6b36d0a50631aad5581527e6b2c369dc (patch) | |
tree | 422c0a915acc89c6203b91e3d00b963fc627ab64 | |
parent | 6158b512163559a92d804d19a7be3e491d483fd4 (diff) | |
parent | c406885688b4551d1f8379e8656d492c3cc6ac62 (diff) | |
download | gitlab-ce-928d974a6b36d0a50631aad5581527e6b2c369dc.tar.gz |
Merge branch 'sh-bump-carrierwave-1.3.1' into 'master'
Bump CarrierWave to 1.3.1
Closes #56096
See merge request gitlab-org/gitlab-ce!24280
-rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d708d0e9740..075aa616215 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy - carrierwave (1.3.0) + carrierwave (1.3.1) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) |