diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-01-09 22:07:51 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-09 20:28:55 -0600 |
commit | 7e46c57abb7b8dae6575ab7b000ba7374a622e5f (patch) | |
tree | 623287695b9c30168441b39b36384d9282b0b726 /Gemfile.lock | |
parent | 95457cabde4f59484064b5b3ed02376c3e18b07c (diff) | |
download | gitlab-ce-7e46c57abb7b8dae6575ab7b000ba7374a622e5f.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
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 4dda0bcad18..b2c29cc1807 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) |