summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-28 14:44:55 -0800
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-28 14:44:55 -0800
commitcfca11f2bc0bea3c767e801707aa9e7571977df5 (patch)
treeed6d6cdfdbd5ddd23aa788ab34caf0d8964212a1
parente9394c48ca7aacd9d151519c1da51d18a21b351b (diff)
parent32be082055be3eea8fd543d302ff71d48ce9a426 (diff)
downloadgitlab-ce-cfca11f2bc0bea3c767e801707aa9e7571977df5.tar.gz
Merge pull request #2423 from hopson/master
Spelling error in merge request email
-rw-r--r--app/views/notify/new_merge_request_email.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 9819767011e..990d4d2aa87 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -14,6 +14,6 @@
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
Branches: #{@merge_request.source_branch} &rarr; #{@merge_request.target_branch}
%p{style: "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
- Asignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
+ Assignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
%td