From: Robert Hopson <Robert.Hopson@gmail.com>
Date: Fri, 28 Dec 2012 18:56:48 +0000 (-0800)
Subject: Update app/views/notify/new_merge_request_email.html.haml
X-Git-Tag: v4.1.0~185^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=32be082055be3eea8fd543d302ff71d48ce9a426;p=wvm%2Fgitlab.git

Update app/views/notify/new_merge_request_email.html.haml

Fix spelling of 'assignee'
---

diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 981976701..990d4d2aa 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