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 | |
| 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')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -107,7 +107,9 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -gem 'carrierwave', '~> 1.2' +# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. +# config/initializers/carrierwave_patch.rb can be removed once that change is released. +gem 'carrierwave', '= 1.2.3' gem 'mini_magick' # Drag and Drop UI |