diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-21 00:09:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-21 00:09:48 +0300 |
| commit | 7fbb996fde20a9905177e253491f858870cd5882 (patch) | |
| tree | 159c692eb50b7eb273fd4013217ceb5fab3296a4 /app/views/notify | |
| parent | 4faa270685797bd689d2035efe7c7e724950eb82 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/_note_email.text.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notify/_note_email.text.erb b/app/views/notify/_note_email.text.erb index 8853519fb8d..b23ba464c06 100644 --- a/app/views/notify/_note_email.text.erb +++ b/app/views/notify/_note_email.text.erb @@ -6,7 +6,7 @@ <%= sanitize_name(author.name) -%> <% if discussion.nil? -%> - <%= 'commented' -%>: + <%= 'commented' -%> <% else -%> <% if discussion.first_note == note -%> <%= 'started a new discussion' -%> @@ -16,9 +16,9 @@ <% if discussion.diff_discussion? -%> <%= "on #{discussion.file_path}" -%> <% end -%> -<%= ':' -%> -<%= " #{target_url}" -%> <% end -%> +<%= ':' -%> +<%= " #{target_url}" -%> <% if discussion&.diff_discussion? && discussion.on_text? -%> |