Valery Sizov 3fcd75a911 Merge CE master into EE master ...

Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb

2014-11-13 17:05:12 +02: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

Fix missing to on reassign MR text email to unassigned.

2014-09-03 01:33:02 +02: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

have email views use iid

2013-08-29 21:26:32 -05: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

Remove markdown notation from notification emails

2014-04-28 14:33:17 -05: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

have email views use iid

2013-08-29 21:26:32 -05: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

Reopen mr email notification.

2014-07-03 13:40:21 +02: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

Remove markdown notation from notification emails

2014-04-28 14:33:17 -05: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

have email views use iid

2013-08-29 21:26:32 -05: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

Fix minor errors/annoyances in email templates

2013-11-08 10:20:15 -06: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

added text-templates for mail notification

2013-02-28 16:39:58 +02: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

have email views use iid

2013-08-29 21:26:32 -05: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

have email views use iid

2013-08-29 21:26:32 -05:00

project_access_granted_email.html.haml

Fix adminarea and emails for new membership logic

2014-09-15 10:57:02 +03:00

project_access_granted_email.text.erb

Fix adminarea and emails for new membership logic

2014-09-15 10:57:02 +03:00

project_was_moved_email.html.haml

Remove HAML eval for const strings.

2014-08-26 18:01:46 +02:00

project_was_moved_email.text.erb

Add the http(s) command lines in the mails for the new origin when a project was moved in an other namespace.

2014-05-21 10:37:41 +02: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

Update email templates for email on push service with links to commit and repository.

2014-09-30 11:28:43 +02:00

repository_push_email.text.haml

Update email templates for email on push service with links to commit and repository.

2014-09-30 11:28:43 +02: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