summaryrefslogtreecommitdiff
path: root/app/views/notify/merged_merge_request_email.text.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/notify/merged_merge_request_email.text.haml')
-rw-r--r--app/views/notify/merged_merge_request_email.text.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notify/merged_merge_request_email.text.haml b/app/views/notify/merged_merge_request_email.text.haml
index 34dbc60e19b..0524e42b717 100644
--- a/app/views/notify/merged_merge_request_email.text.haml
+++ b/app/views/notify/merged_merge_request_email.text.haml
@@ -1,8 +1,8 @@
-= "Merge Request ##{@merge_request.iid} was merged"
+= "合并请求 ##{@merge_request.iid} 已被合并"
-Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
+合并请求链接: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)}
= merge_path_description(@merge_request, 'to')
-Author: #{@merge_request.author_name}
-Assignee: #{@merge_request.assignee_name}
+作者: #{@merge_request.author_name}
+指派给: #{@merge_request.assignee_name}