diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-18 18:15:24 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-18 18:15:24 +0000 |
| commit | 027a4eff98bd434ba8e278ae37e4851e59f7c8d6 (patch) | |
| tree | 891b331abe693ff4a72a6a0f8ec55a39a352b179 /app/views/notify | |
| parent | e6b742aaf4fbe22928d61a69bdef5e5c1539fe57 (diff) | |
| parent | 18f13e8bb8b63b28efb7c3b53a3143a068806225 (diff) | |
| download | gitlab-ce-027a4eff98bd434ba8e278ae37e4851e59f7c8d6.tar.gz | |
Merge branch 'outlook-email-spacing' into 'master'
Fix email line-height in Outlook
On Outlook.com:
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19060.
See merge request !5843
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/repository_push_email.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml index c161ecc3463..4dc39a72225 100644 --- a/app/views/notify/repository_push_email.html.haml +++ b/app/views/notify/repository_push_email.html.haml @@ -76,7 +76,7 @@ - if blob && blob.respond_to?(:text?) && blob_text_viewable?(blob) %table.code.white - diff_file.highlighted_diff_lines.each do |line| - = render "projects/diffs/line", line: line, diff_file: diff_file, plain: true + = render "projects/diffs/line", line: line, diff_file: diff_file, plain: true, email: true - else No preview for this file type %br |