summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/helpers/emails_helper.rb5
-rw-r--r--spec/helpers/emails_helper_spec.rb2
2 files changed, 5 insertions, 2 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index 3beddff9206..a6d9e37ac76 100644
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -54,7 +54,10 @@ module EmailsHelper
def header_logo
if brand_item && brand_item.header_logo?
- brand_header_logo
+ image_tag(
+ brand_item.header_logo,
+ style: 'height: 50px'
+ )
else
image_tag(
image_url('mailers/gitlab_header_logo.gif'),
diff --git a/spec/helpers/emails_helper_spec.rb b/spec/helpers/emails_helper_spec.rb
index b9519e387eb..cd112dbb2fb 100644
--- a/spec/helpers/emails_helper_spec.rb
+++ b/spec/helpers/emails_helper_spec.rb
@@ -52,7 +52,7 @@ describe EmailsHelper do
)
expect(header_logo).to eq(
- %{<img src="/uploads/appearance/header_logo/#{appearance.id}/dk.png" alt="Dk" />}
+ %{<img style="height: 50px" src="/uploads/appearance/header_logo/#{appearance.id}/dk.png" alt="Dk" />}
)
end
end