app/views/notify · 4077f66bebfd1ef8fe78ef93876b872c083d16a5 · Forest Godfrey / gitlab-ce

Merge branch 'emailsonpush-last-line' into 'master' · 18dfe0ce

authored Apr 07, 2015

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

18dfe0ce

Name	Last commit	Last update
..
_note_message.html.haml		Loading commit data...
_reassigned_issuable_email.html.haml		Loading commit data...
_reassigned_issuable_email.text.erb		Loading commit data...
closed_issue_email.html.haml		Loading commit data...
closed_issue_email.text.haml		Loading commit data...
closed_merge_request_email.html.haml		Loading commit data...
closed_merge_request_email.text.haml		Loading commit data...
group_access_granted_email.html.haml		Loading commit data...
group_access_granted_email.text.erb		Loading commit data...
issue_status_changed_email.html.haml		Loading commit data...
issue_status_changed_email.text.erb		Loading commit data...
merge_request_status_email.html.haml		Loading commit data...
merge_request_status_email.text.haml		Loading commit data...
merged_merge_request_email.html.haml		Loading commit data...
merged_merge_request_email.text.haml		Loading commit data...
new_email_email.html.haml		Loading commit data...
new_email_email.text.erb		Loading commit data...
new_issue_email.html.haml		Loading commit data...
new_issue_email.text.erb		Loading commit data...
new_merge_request_email.html.haml		Loading commit data...
new_merge_request_email.text.erb		Loading commit data...
new_ssh_key_email.html.haml		Loading commit data...
new_ssh_key_email.text.erb		Loading commit data...
new_user_email.html.haml		Loading commit data...
new_user_email.text.erb		Loading commit data...
note_commit_email.html.haml		Loading commit data...
note_commit_email.text.erb		Loading commit data...
note_issue_email.html.haml		Loading commit data...
note_issue_email.text.erb		Loading commit data...
note_merge_request_email.html.haml		Loading commit data...
note_merge_request_email.text.erb		Loading commit data...
project_access_granted_email.html.haml		Loading commit data...
project_access_granted_email.text.erb		Loading commit data...
project_was_moved_email.html.haml		Loading commit data...
project_was_moved_email.text.erb		Loading commit data...
reassigned_issue_email.html.haml		Loading commit data...
reassigned_issue_email.text.erb		Loading commit data...
reassigned_merge_request_email.html.haml		Loading commit data...
reassigned_merge_request_email.text.erb		Loading commit data...
repository_push_email.html.haml		Loading commit data...
repository_push_email.text.haml		Loading commit data...