diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-09-06 11:30:15 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-09-06 11:30:15 +0000 |
| commit | abc2caaa2894ee4bc9902228efc30a022044e7d1 (patch) | |
| tree | 1998a120a01f2d12c264d6385623498d225a4817 /Gemfile.lock | |
| parent | 228d819b5761de1e2362952a9d0f08828c88424d (diff) | |
| parent | 262b974123d22b5d6b662b232ca4792d7998a166 (diff) | |
| download | gitlab-ce-abc2caaa2894ee4bc9902228efc30a022044e7d1.tar.gz | |
Merge branch 'sh-fix-attachments-inline' into 'master'
Fix attachments not displaying inline with Google Cloud Storage
Closes #49957
See merge request gitlab-org/gitlab-ce!21265
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 c874d09a519..e7ab97fb299 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -996,7 +996,7 @@ DEPENDENCIES bundler-audit (~> 0.5.0) capybara (~> 2.15) capybara-screenshot (~> 1.0.0) - carrierwave (~> 1.2) + carrierwave (= 1.2.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) |