Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

2015-06-05 11:40:36 +02:00

..

_note_message.html.haml

Revert "Merge branch 'fix_email_images' into 'master'"

2015-04-13 12:34:47 +02: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

group_invite_accepted_email.html.haml

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

group_invite_accepted_email.text.erb

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

group_invite_declined_email.html.haml

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

group_invite_declined_email.text.erb

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

group_member_invited_email.html.haml

Let invites be declined.

2015-04-14 12:08:11 +02:00

group_member_invited_email.text.erb

Let invites be declined.

2015-04-14 12:08:11 +02: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

Revert "Merge branch 'fix_email_images' into 'master'"

2015-04-13 12:34:47 +02:00

new_issue_email.text.erb

email: fix typo

2015-05-18 09:33:16 -04:00

new_merge_request_email.html.haml

Revert "Merge branch 'fix_email_images' into 'master'"

2015-04-13 12:34:47 +02:00

new_merge_request_email.text.erb

email: fix typo

2015-05-18 09:33:16 -04: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

Fill in email on the new password form

2015-05-16 14:03:18 -06:00

new_user_email.text.erb

Explain reset token expiration in emails

2015-05-16 14:03:07 -06: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_invite_accepted_email.html.haml

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

project_invite_accepted_email.text.erb

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

project_invite_declined_email.html.haml

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

project_invite_declined_email.text.erb

Remove superfluous info from invite accepted/declined mails.

2015-04-14 23:06:21 +02:00

project_member_invited_email.html.haml

Let invites be declined.

2015-04-14 12:08:11 +02:00

project_member_invited_email.text.erb

Let invites be declined.

2015-04-14 12:08:11 +02: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

Use entity number for plus sign

2015-05-27 13:04:18 +00: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

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