summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-07-01 12:26:03 +0000
committerDouwe Maan <douwe@gitlab.com>2019-07-01 12:26:03 +0000
commite20e9831a252ff81e7753abac554d371a6192343 (patch)
tree1d65692ad7eb1ddd782e1a9832ecd54437fb66f8
parent8c59b4d7df47e1cbc91ffa075a968bb89f9ddc03 (diff)
parent7e84f3715e985ee08a107f9968974b55c965f05a (diff)
downloadgitlab-ce-e20e9831a252ff81e7753abac554d371a6192343.tar.gz
Merge branch 'move-colon-on-merge-request-notification' into 'master'
Move colon on merge request notification See merge request gitlab-org/gitlab-ce!30178
-rw-r--r--app/views/notify/new_merge_request_email.text.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb
index c3f2902c78a..6c0d7b1e60b 100644
--- a/app/views/notify/new_merge_request_email.text.erb
+++ b/app/views/notify/new_merge_request_email.text.erb
@@ -1,7 +1,7 @@
<%= @merge_request.author_name %> <%= 'created a merge request:' %> <%= url_for(project_merge_request_url(@merge_request.target_project, @merge_request)) %>
<%= merge_path_description(@merge_request, 'to') %>
-<%= 'Author' %>: <%= @merge_request.author_name %>
+<%= 'Author:' %> <%= @merge_request.author_name %>
<%= assignees_label(@merge_request) %>
<%= render_if_exists 'notify/merge_request_approvers', presenter: @mr_presenter %>