diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-25 00:24:00 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-25 08:22:34 -0800 |
| commit | 7036f75f6710d5b2cb188864c3c75e06721a755f (patch) | |
| tree | 75d10c9f6ed4e332a3dec12ebb63e04b1f4a60b2 /app/helpers | |
| parent | 5dc656fc1f053d397ad1e6c1d85a815f03a5d634 (diff) | |
| download | gitlab-ce-7036f75f6710d5b2cb188864c3c75e06721a755f.tar.gz | |
Use system paths for appearance logos
When object storage is enabled, the logos used to customize a GitLab
appearance causes the time-limited URLs to be used. We fix this
by forcing all of these URLs to use the /uploads/-/system prefix
so that they will always be proxied through GitLab.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6778
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/appearances_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/emails_helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb index 3f69af50f25..473c90c882c 100644 --- a/app/helpers/appearances_helper.rb +++ b/app/helpers/appearances_helper.rb @@ -11,7 +11,7 @@ module AppearancesHelper end def brand_image - image_tag(current_appearance.logo) if current_appearance&.logo? + image_tag(current_appearance.logo_path) if current_appearance&.logo? end def brand_text @@ -28,7 +28,7 @@ module AppearancesHelper def brand_header_logo if current_appearance&.header_logo? - image_tag current_appearance.header_logo + image_tag current_appearance.header_logo_path else render 'shared/logo.svg' end diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb index e4c46ceeaa2..fa5d3ae474a 100644 --- a/app/helpers/emails_helper.rb +++ b/app/helpers/emails_helper.rb @@ -58,7 +58,7 @@ module EmailsHelper def header_logo if current_appearance&.header_logo? image_tag( - current_appearance.header_logo, + current_appearance.header_logo_path, style: 'height: 50px' ) else |