diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 15:00:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 15:00:22 +0000 |
| commit | 958e727f7074b323609019bba086b66da9cf17e0 (patch) | |
| tree | cdc960b19c3db0293f0211d93d4414ab86415486 /app/views/notify | |
| parent | 7b55d2c5b7b64f56daef58b23a391056dd2101f0 (diff) | |
| parent | e97349cb42e5886f6e9e960851e38b4f0c2036e5 (diff) | |
| download | gitlab-ce-958e727f7074b323609019bba086b66da9cf17e0.tar.gz | |
Merge branch 'fix-email-typo' into 'master'
notify: fix typo in merged_merge_request_email template
All (two) other templates with this line use 'url' rather than 'Url'.
See merge request !1151
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/merged_merge_request_email.text.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/merged_merge_request_email.text.haml b/app/views/notify/merged_merge_request_email.text.haml index 9db75bdb19e..34dbc60e19b 100644 --- a/app/views/notify/merged_merge_request_email.text.haml +++ b/app/views/notify/merged_merge_request_email.text.haml @@ -1,6 +1,6 @@ = "Merge Request ##{@merge_request.iid} was merged" -Merge Request Url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)} +Merge Request url: #{namespace_project_merge_request_url(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request)} = merge_path_description(@merge_request, 'to') |