Dmitriy Zaporozhets 18dfe0ce76 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

2015-04-07 09:54:23 +00:00

..

_note_message.html.haml

Use relative URL for Markdown references, except in mails.

2015-03-27 10:39:05 +01:00

_reassigned_issuable_email.html.haml

Fix missing to on reassign MR email to unassigned.

2014-09-01 17:35:25 +02:00

_reassigned_issuable_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

closed_issue_email.html.haml

Remove custom link to target in notification emails

2014-03-03 16:58:44 +01:00

closed_issue_email.text.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

closed_merge_request_email.html.haml

Remove markdown notation from notification emails

2014-04-28 14:33:17 -05:00

closed_merge_request_email.text.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

group_access_granted_email.html.haml

Use group_member instead of users_group or membership.

2015-03-15 13:49:41 +01:00

group_access_granted_email.text.erb

Use group_member instead of users_group or membership.

2015-03-15 13:49:41 +01:00

issue_status_changed_email.html.haml

Remove custom link to target in notification emails

2014-03-03 16:58:44 +01:00

issue_status_changed_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

merge_request_status_email.html.haml

Reopen mr email notification.

2014-07-03 13:40:21 +02:00

merge_request_status_email.text.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

merged_merge_request_email.html.haml

Remove markdown notation from notification emails

2014-04-28 14:33:17 -05:00

merged_merge_request_email.text.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

new_email_email.html.haml

Add email aliases for users

2014-02-13 22:59:39 -06:00

new_email_email.text.erb

Add email aliases for users

2014-02-13 22:59:39 -06:00

new_issue_email.html.haml

Use relative URL for Markdown references, except in mails.

2015-03-27 10:39:05 +01:00

new_issue_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

new_merge_request_email.html.haml

Use relative URL for Markdown references, except in mails.

2015-03-27 10:39:05 +01:00

new_merge_request_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

new_ssh_key_email.html.haml

improve ssh key emails

2014-10-28 00:06:22 -07:00

new_ssh_key_email.text.erb

improve ssh key emails

2014-10-28 00:06:22 -07:00

new_user_email.html.haml

Do not sent a generated password via email for admin created user.

2014-07-15 13:25:11 +02:00

new_user_email.text.erb

Do not sent a generated password via email for admin created user.

2014-07-15 13:25:11 +02:00

note_commit_email.html.haml

Remove custom link to target in notification emails

2014-03-03 16:58:44 +01:00

note_commit_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

note_issue_email.html.haml

Remove custom link to target in notification emails

2014-03-03 16:58:44 +01:00

note_issue_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

note_merge_request_email.html.haml

Make the merge request notification emails more readable

2014-03-03 16:58:44 +01:00

note_merge_request_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

project_access_granted_email.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

project_access_granted_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

project_was_moved_email.html.haml

Fix email template css for project moved emails

2015-03-17 18:38:10 -07:00

project_was_moved_email.text.erb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

reassigned_issue_email.html.haml

Fix missing to on reassign MR email to unassigned.

2014-09-01 17:35:25 +02:00

reassigned_issue_email.text.erb

Fix missing to on reassign MR text email to unassigned.

2014-09-03 01:33:02 +02:00

reassigned_merge_request_email.html.haml

Fix missing to on reassign MR email to unassigned.

2014-09-01 17:35:25 +02:00

reassigned_merge_request_email.text.erb

Fix missing to on reassign MR text email to unassigned.

2014-09-03 01:33:02 +02:00

repository_push_email.html.haml

Move EmailsOnPush highlight CSS inline instead of being in every notification email.

2015-03-31 12:36:36 +02:00

repository_push_email.text.haml

Send EmailsOnPush email when branch or tag is created or deleted.

2015-03-18 14:07:28 +01:00