Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork ...

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

2013-08-08 12:22:09 +03:00

..

_note_message.html.haml

restyle and cleanup emails

2013-03-12 10:46:04 +02:00

closed_issue_email.html.haml

Add close issue/mr methods to Notify. Refactored Notificationservice

2013-03-28 12:14:53 +02:00

closed_issue_email.text.haml

add text templates to new emails

2013-03-28 12:33:54 +02:00

closed_merge_request_email.html.haml

Update emails to describe path using for_fork?

2013-07-17 22:48:03 -04:00

closed_merge_request_email.text.haml

Update emails to describe path using for_fork?

2013-07-17 22:48:03 -04:00

issue_status_changed_email.html.haml

restyle and cleanup emails

2013-03-12 10:46:04 +02:00

issue_status_changed_email.text.erb

added text-templates for mail notification

2013-02-28 16:39:58 +02:00

merged_merge_request_email.html.haml

Update emails to describe path using for_fork?

2013-07-17 22:48:03 -04:00

merged_merge_request_email.text.haml

Update emails to describe path using for_fork?

2013-07-17 22:48:03 -04:00

new_issue_email.html.haml

Fixed new mr/issue emails

2013-03-28 12:52:44 +02:00

new_issue_email.text.erb

Fixed new mr/issue emails

2013-03-28 12:52:44 +02:00

new_merge_request_email.html.haml

Update emails to describe path using for_fork?

2013-07-17 22:48:03 -04:00

new_merge_request_email.text.erb

Revert note.project references back to @project

2013-07-17 22:48:03 -04:00

new_ssh_key_email.html.haml

Fix profile emails with new key route

2013-06-24 19:24:27 +03:00

new_ssh_key_email.text.erb

Fix profile emails with new key route

2013-06-24 19:24:27 +03:00

new_user_email.html.haml

Update new_user_email.html.haml

2013-08-04 18:04:20 -04:00

new_user_email.text.erb

Update new_user_email.text.erb

2013-08-04 18:04:47 -04:00

note_commit_email.html.haml

restyle and cleanup emails

2013-03-12 10:46:04 +02: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

restyle and cleanup emails

2013-03-12 10:46:04 +02:00

note_issue_email.text.erb

added text-templates for mail notification

2013-02-28 16:39:58 +02:00

note_merge_request_email.html.haml

Merge Request on forked projects

2013-07-17 22:41:30 -04:00

note_merge_request_email.text.erb

Merge Request on forked projects

2013-07-17 22:41:30 -04:00

note_wall_email.html.haml

fix tests. added jquery.timeago.js

2013-03-19 14:39:32 +02:00

note_wall_email.text.erb

fix tests. added jquery.timeago.js

2013-03-19 14:39:32 +02:00

project_access_granted_email.html.haml

restyle and cleanup emails

2013-03-12 10:46:04 +02:00

project_access_granted_email.text.erb

added text-templates for mail notification

2013-02-28 16:39:58 +02:00

project_was_moved_email.html.haml

restyle and cleanup emails

2013-03-12 10:46:04 +02:00

project_was_moved_email.text.erb

fix project move email

2013-03-12 12:40:49 +02:00

reassigned_issue_email.html.haml

Fix error when reassign issue/merge_request from non-assigned. Fixes #3201

2013-07-01 19:01:19 +03:00

reassigned_issue_email.text.erb

Fix error when reassign issue/merge_request from non-assigned. Fixes #3201

2013-07-01 19:01:19 +03:00

reassigned_merge_request_email.html.haml

Merge Request on forked projects

2013-07-17 22:41:30 -04:00

reassigned_merge_request_email.text.erb

Merge Request on forked projects

2013-07-17 22:41:30 -04:00