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
..
ci	Removes redundant error message for script failures	2018-05-24 15:14:28 -05:00
clusters	Move can_toggle_cluster? from helper to presenter	2017-12-05 17:09:04 +01:00
conversational_development_index	Store & use ConvDev percentages returned by Version app	2017-08-07 20:52:08 +02:00
projects/settings	Change all `:empty_project` to `:project`	2017-08-02 17:47:31 -04:00
commit_status_presenter_spec.rb	Respect the inheritance chain between Ci::Build and CommitStatus	2018-05-16 15:59:51 -05:00
group_member_presenter_spec.rb	Present member collection at the controller level	2017-12-12 18:14:58 +01:00
merge_request_presenter_spec.rb	Notify only when unmergeable due to conflict	2018-06-20 23:27:17 +08:00
project_member_presenter_spec.rb	Present member collection at the controller level	2017-12-12 18:14:58 +01:00
project_presenter_spec.rb	Only show push-to-master authorized users	2018-04-24 13:59:41 +02:00