diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-01 13:36:12 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-04-01 13:36:12 +0300 |
| commit | 9763c9cc0e3c12842ae214b314e2873b483f9583 (patch) | |
| tree | d44719da0a94050b8774b69871e9d60cd2aa4786 | |
| parent | 9e90ac1b6c612d008dc478c6a7ad5aa4307832fb (diff) | |
| parent | 3712bb4a05e39293f86a42f75aaa415123d20961 (diff) | |
Merge branch 'ce-10220-link-to-note-from-email' into 'master'
Display link to next to note in text email
See merge request gitlab-org/gitlab-ce!26695
| -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 -%> |