Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre ...

Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb

2015-02-23 23:56:59 -08:00

..

_note_message.html.haml

Remove the quote-style around message in notification emails

2014-03-03 16:58:44 +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

SHow group name in access granted email

2014-03-11 13:33:47 +02:00

group_access_granted_email.text.erb

Email templates when user was added to group

2013-09-11 21:17:28 +03: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

Add the description to the "new issue" and "new merge request" emails

2014-03-03 16:58:44 +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

Simplify the default layout of notification emails

2014-03-03 16:58:44 +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

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -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

Upgrade to Rails 4.1.9

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

repository_push_email.text.haml

Upgrade to Rails 4.1.9

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

send_admin_notification.html.haml

Add unsubscribe link

2014-08-11 13:23:12 +02:00

send_admin_notification.text.haml

Add unsubscribe link

2014-08-11 13:23:12 +02:00

send_unsubscribed_notification.html.haml

Add the email templates

2014-08-26 17:17:04 +02:00

send_unsubscribed_notification.text.haml

Add the email templates

2014-08-26 17:17:04 +02:00