Merge branch 'fix-typo-in-email' into 'master'

Fix "Asignee" typo in new issue/merge request emails

See merge request !676
This commit is contained in:
Robert Speicher 2015-05-26 21:47:04 +00:00
commit cc0f223858
2 changed files with 4 additions and 4 deletions

View file

@ -1,5 +1,5 @@
New Issue was created.
Issue <%= @issue.iid %>: <%= url_for(namespace_project_issue_url(@issue.project.namespace, @issue.project, @issue)) %>
Author: <%= @issue.author_name %>
Asignee: <%= @issue.assignee_name %>
Author: <%= @issue.author_name %>
Assignee: <%= @issue.assignee_name %>

View file

@ -3,6 +3,6 @@ New Merge Request #<%= @merge_request.iid %>
<%= url_for(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 %>
Asignee: <%= @merge_request.assignee_name %>
Author: <%= @merge_request.author_name %>
Assignee: <%= @merge_request.assignee_name %>