Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
c1e94479
Commit
c1e94479
authored
Feb 17, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restrict height of the custom brand logo in emails
parent
26da2c45
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
app/helpers/emails_helper.rb
app/helpers/emails_helper.rb
+4
-1
spec/helpers/emails_helper_spec.rb
spec/helpers/emails_helper_spec.rb
+1
-1
No files found.
app/helpers/emails_helper.rb
View file @
c1e94479
...
@@ -54,7 +54,10 @@ module EmailsHelper
...
@@ -54,7 +54,10 @@ module EmailsHelper
def
header_logo
def
header_logo
if
brand_item
&&
brand_item
.
header_logo?
if
brand_item
&&
brand_item
.
header_logo?
brand_header_logo
image_tag
(
brand_item
.
header_logo
,
style:
'height: 50px'
)
else
else
image_tag
(
image_tag
(
image_url
(
'mailers/gitlab_header_logo.gif'
),
image_url
(
'mailers/gitlab_header_logo.gif'
),
...
...
spec/helpers/emails_helper_spec.rb
View file @
c1e94479
...
@@ -52,7 +52,7 @@ describe EmailsHelper do
...
@@ -52,7 +52,7 @@ describe EmailsHelper do
)
)
expect
(
header_logo
).
to
eq
(
expect
(
header_logo
).
to
eq
(
%{<img src="/uploads/appearance/header_logo/#{appearance.id}/dk.png" alt="Dk" />}
%{<img s
tyle="height: 50px" s
rc="/uploads/appearance/header_logo/#{appearance.id}/dk.png" alt="Dk" />}
)
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment