diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-07 09:54:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-07 09:54:23 +0000 |
| commit | 18dfe0ce76121a9a6f5a83588590b05acc9ff7b8 (patch) | |
| tree | 8e65d0b515a137a27dfeafea6c575e3c4c372c28 /app/views/notify | |
| parent | d21d5d2d72610213be4f678e4518c39694c9f502 (diff) | |
| parent | cef0fe244f4faf55bc1d4bd7402129ce80d427e9 (diff) | |
| download | gitlab-ce-18dfe0ce76121a9a6f5a83588590b05acc9ff7b8.tar.gz | |
Merge branch 'emailsonpush-last-line' into 'master'
Fix final line in EmailsOnPush email diff being rendered as error.
Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194.
Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18.
See merge request !480
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/repository_push_email.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml index bbf7004c906..a374a662333 100644 --- a/app/views/notify/repository_push_email.html.haml +++ b/app/views/notify/repository_push_email.html.haml @@ -59,8 +59,7 @@ %strong = diff.new_path %hr - %pre - = color_email_diff(diff.diff) + = color_email_diff(diff.diff) %br - if @compare.timeout |