kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Kushal Pandya 2019-04-01 10:36:12 +00:00
parent 9e90ac1b6c 3712bb4a05
commit 9763c9cc0e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/notify/_note_email.text.erb
View File

@ -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 -%>