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
..
emails	Notify only when unmergeable due to conflict	2018-06-20 23:27:17 +08:00
abuse_report_mailer.rb	use Gitlab::UserSettings directly as a singleton instead of including/extending it	2018-02-02 18:39:55 +00:00
base_mailer.rb	use Gitlab::UserSettings directly as a singleton instead of including/extending it	2018-02-02 18:39:55 +00:00
devise_mailer.rb	use common devise layout and use heading style	2017-06-13 22:36:45 +02:00
email_rejection_mailer.rb	Generate valid Message-ID in email rejection mailer	2016-01-30 18:30:53 +08:00
notify.rb	Backport 5480-epic-notifications from EE	2018-05-07 12:58:47 -06:00
repository_check_mailer.rb	Fix code for cops	2017-02-23 09:31:57 -06:00