From 7e46c57abb7b8dae6575ab7b000ba7374a622e5f Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 9 Jan 2019 22:07:51 +0000 Subject: [PATCH] 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 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- GitLab