diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-05-26 21:47:04 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-05-26 21:47:04 +0000 |
| commit | cc0f223858f17f5981f99eacb38e84c76a4f0188 (patch) | |
| tree | 9868e37eae23967976706b9bb42525aeb9ce9fcb | |
| parent | 0ec1e4c028b6e663929b38f1c90f4158f9a49cc2 (diff) | |
| parent | b8571f141ec8e746d5e74c1a66434b4166db3c64 (diff) | |
| download | gitlab-ce-cc0f223858f17f5981f99eacb38e84c76a4f0188.tar.gz | |
Merge branch 'fix-typo-in-email' into 'master'
Fix "Asignee" typo in new issue/merge request emails
See merge request !676
| -rw-r--r-- | app/views/notify/new_issue_email.text.erb | 4 | ||||
| -rw-r--r-- | app/views/notify/new_merge_request_email.text.erb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/notify/new_issue_email.text.erb b/app/views/notify/new_issue_email.text.erb index 0cc62935498..fc64c98038b 100644 --- a/app/views/notify/new_issue_email.text.erb +++ b/app/views/notify/new_issue_email.text.erb @@ -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 %> diff --git a/app/views/notify/new_merge_request_email.text.erb b/app/views/notify/new_merge_request_email.text.erb index f08039ad045..bdcca6e4ab7 100644 --- a/app/views/notify/new_merge_request_email.text.erb +++ b/app/views/notify/new_merge_request_email.text.erb @@ -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 %> |