diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-18 21:15:24 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-19 02:45:39 +0300 |
| commit | ab5cc542aac758204b9a6c8e1361e1b39c0564fe (patch) | |
| tree | abbe024ece664be1dccbb5f5092884dfb19cc81a | |
| parent | bfeb8f29b2e79a7ee9970be9eef573e71ab862d7 (diff) | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/mailers/repository_push_email.scss | 5 | ||||
| -rw-r--r-- | app/views/notify/repository_push_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_line.html.haml | 7 |
4 files changed, 12 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3a86ff9d189..0324a5be080 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -50,6 +50,7 @@ v 8.11.0 (unreleased) - Fix issue on empty project to allow developers to only push to protected branches if given permission - Add green outline to New Branch button. !5447 (winniehell) - Optimize generating of cache keys for issues and notes + - Fix repository push email formatting in Outlook - Improve performance of syntax highlighting Markdown code blocks - Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects - Remove delay when hitting "Reply..." button on page with a lot of discussions diff --git a/app/assets/stylesheets/mailers/repository_push_email.scss b/app/assets/stylesheets/mailers/repository_push_email.scss index 33aedf1f7c1..5bfe9bcb443 100644 --- a/app/assets/stylesheets/mailers/repository_push_email.scss +++ b/app/assets/stylesheets/mailers/repository_push_email.scss @@ -45,7 +45,6 @@ .line_content { padding-left: 0.5em; padding-right: 0.5em; - white-space: pre; &.old { background-color: $line-removed; @@ -71,6 +70,10 @@ } } +pre { + margin: 0; +} + span.highlight_word { background-color: #fafe3d !important; } 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 diff --git a/app/views/projects/diffs/_line.html.haml b/app/views/projects/diffs/_line.html.haml index 2d6a370b848..891b2bd9802 100644 --- a/app/views/projects/diffs/_line.html.haml +++ b/app/views/projects/diffs/_line.html.haml @@ -1,3 +1,4 @@ +- email = local_assigns.fetch(:email, false) - plain = local_assigns.fetch(:plain, false) - type = line.type - line_code = diff_file.line_code(line) unless plain @@ -22,4 +23,8 @@ = link_text - else %a{href: "##{line_code}", data: { linenumber: link_text }} - %td.line_content.noteable_line{ class: type, data: (diff_view_line_data(line_code, diff_file.position(line), type) unless plain) }= diff_line_content(line.text, type) + %td.line_content.noteable_line{ class: type, data: (diff_view_line_data(line_code, diff_file.position(line), type) unless plain) }< + - if email + %pre= diff_line_content(line.text, type) + - else + = diff_line_content(line.text, type) |