• Mark Chao's avatar
    Notify only when unmergeable due to conflict · 5b994b81
    Mark Chao authored
    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
    5b994b81
merge_request_presenter_spec.rb 13.2 KB