kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/notify
History
Mark Chao 5b994b8199 Notify only when unmergeable due to conflict 
There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.

Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.

Remove unmergeable_reason as now only conflict is notified

Update spec
 		2018-06-20 23:27:17 +08:00
..
links Rename BuildsController to JobsController 2017-05-17 20:17:30 +08:00
_note_email.html.haml use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
_note_email.text.erb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
_relabeled_issuable_email.html.haml
…
_relabeled_issuable_email.text.erb
…
closed_issue_email.html.haml
…
closed_issue_email.text.haml Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
closed_merge_request_email.html.haml
…
closed_merge_request_email.text.haml Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
issue_due_email.html.haml Make issue due email more consistent with other mailers 2018-04-17 13:59:46 +01:00
issue_due_email.text.erb Update email body (html+text) 2018-03-26 08:10:58 +01:00
issue_moved_email.html.haml Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
issue_moved_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
issue_status_changed_email.html.haml
…
issue_status_changed_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
member_access_denied_email.html.haml
…
member_access_denied_email.text.erb
…
member_access_granted_email.html.haml
…
member_access_granted_email.text.erb
…
member_access_requested_email.html.haml
…
member_access_requested_email.text.erb
…
member_invite_accepted_email.html.haml
…
member_invite_accepted_email.text.erb
…
member_invite_declined_email.html.haml
…
member_invite_declined_email.text.erb
…
member_invited_email.html.haml Resolve "Opening Project with invite but without accepting leads to 404 error page" 2018-05-17 09:19:47 +00:00
member_invited_email.text.erb
…
merge_request_status_email.html.haml
…
merge_request_status_email.text.haml Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
merge_request_unmergeable_email.html.haml Notify only when unmergeable due to conflict 2018-06-20 23:27:17 +08:00
merge_request_unmergeable_email.text.haml Notify only when unmergeable due to conflict 2018-06-20 23:27:17 +08:00
merged_merge_request_email.html.haml
…
merged_merge_request_email.text.haml Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
new_gpg_key_email.html.haml notification email on add new gpg key 2017-07-27 15:40:41 +02:00
new_gpg_key_email.text.erb notification email on add new gpg key 2017-07-27 15:40:41 +02:00
new_issue_email.html.haml use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
new_issue_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
new_mention_in_issue_email.html.haml Fix specs 2017-04-05 17:44:14 +01:00
new_mention_in_issue_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
new_mention_in_merge_request_email.html.haml Fix specs 2017-04-05 17:44:14 +01:00
new_mention_in_merge_request_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
new_merge_request_email.html.haml Remove EE-specific code from new MR email 2018-06-18 12:22:05 +01:00
new_merge_request_email.text.erb Remove EE-specific code from new MR email 2018-06-18 12:22:05 +01:00
new_ssh_key_email.html.haml
…
new_ssh_key_email.text.erb
…
new_user_email.html.haml use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
new_user_email.text.erb
…
note_commit_email.html.haml Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00
note_commit_email.text.erb Address review comments 2017-04-05 17:44:14 +01:00
note_issue_email.html.haml Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00
note_issue_email.text.erb Address review comments 2017-04-05 17:44:14 +01:00
note_merge_request_email.html.haml Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00
note_merge_request_email.text.erb Address review comments 2017-04-05 17:44:14 +01:00
note_personal_snippet_email.html.haml Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00
note_personal_snippet_email.text.erb Address review comments 2017-04-05 17:44:14 +01:00
note_snippet_email.html.haml Better notification emails for notes and (diff) discussions 2017-04-05 17:44:14 +01:00
note_snippet_email.text.erb Address review comments 2017-04-05 17:44:14 +01:00
pages_domain_disabled_email.html.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pages_domain_disabled_email.text.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pages_domain_enabled_email.html.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pages_domain_enabled_email.text.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pages_domain_verification_failed_email.html.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pages_domain_verification_failed_email.text.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pages_domain_verification_succeeded_email.html.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pages_domain_verification_succeeded_email.text.haml Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pipeline_failed_email.html.haml [skip ci] rename .info to .table-info 2018-04-09 13:56:59 -05:00
pipeline_failed_email.text.erb Optimise trace handling code to use streaming instead of full read 2017-04-06 16:20:27 +00:00
pipeline_success_email.html.haml [skip ci] Replace .success with .table-success 2018-04-09 14:08:51 -05:00
pipeline_success_email.text.erb Fix job count in pipeline success mail 2017-12-18 09:13:46 +00:00
project_was_exported_email.html.haml Replace deprecated name_with_namespace with full_name in app/views 2018-03-05 15:45:35 +02:00
project_was_exported_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
project_was_moved_email.html.haml Replace deprecated name_with_namespace with full_name in app/views 2018-03-05 15:45:35 +02:00
project_was_moved_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
project_was_not_exported_email.html.haml
…
project_was_not_exported_email.text.haml
…
push_to_merge_request_email.html.haml Fix undefined method `one?` when pushing to an existing merge request 2018-04-07 23:43:40 -07:00
push_to_merge_request_email.text.haml Fix undefined method `one?` when pushing to an existing merge request 2018-04-07 23:43:40 -07:00
reassigned_issue_email.html.haml Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
reassigned_issue_email.text.erb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
reassigned_merge_request_email.html.haml Fix reassigned MR email 2017-05-10 13:58:29 +01:00
reassigned_merge_request_email.text.erb Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
relabeled_issue_email.html.haml
…
relabeled_issue_email.text.erb
…
relabeled_merge_request_email.html.haml
…
relabeled_merge_request_email.text.erb
…
repository_push_email.html.haml Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
repository_push_email.text.haml Add question mark to Gitlab::Diff::File predicate methods 2017-05-23 15:37:04 -05:00
resolved_all_discussions_email.html.haml
…
resolved_all_discussions_email.text.erb Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00