diff options
| author | Mark Chao <mchao@gitlab.com> | 2019-03-25 18:28:07 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2019-03-28 14:16:50 +0800 |
| commit | 3712bb4a05e39293f86a42f75aaa415123d20961 (patch) | |
| tree | 571761346607902850d4cba1b8605f982cc0ca0d | |
| parent | 5a2be4c8a548331df011e9de0bc77d7bbe48f700 (diff) | |
| download | gitlab-ce-ce-10220-link-to-note-from-email.tar.gz | |
Display link to review note in text emailce-10220-link-to-note-from-email
similar with HTML email
| -rw-r--r-- | app/views/notify/_note_email.text.erb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb index 5a67214059c..fae8fa3ccf3 100644 --- a/app/views/notify/_note_email.text.erb +++ b/app/views/notify/_note_email.text.erb @@ -1,5 +1,6 @@ <% note = local_assigns.fetch(:note, @note) -%> <% diff_limit = local_assigns.fetch(:diff_limit, nil) -%> +<% target_url = local_assigns.fetch(:target_url, @target_url) -%> <% discussion = note.discussion if note.part_of_discussion? -%> <% if discussion && !discussion.individual_note? -%> @@ -13,6 +14,9 @@ <%= " on #{discussion.file_path}" -%> <% end -%> <%= ":" -%> +<% if discussion.diff_discussion? || !discussion.new_discussion? -%> +<%= " #{target_url}" -%> +<% end -%> <% elsif Gitlab::CurrentSettings.email_author_in_body -%> |