diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-07 23:56:59 +0900 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-20 23:27:17 +0800 |
| commit | 5b994b8199a3679b6f5ef0d00edce22ea9662664 (patch) | |
| tree | 6574c99eb3b963d0518e079f041552bb10367756 /Gemfile.rails5.lock | |
| parent | 222284a6bf9348b30b5ce2b1b04370163e2120e5 (diff) | |
| download | gitlab-ce-5b994b8199a3679b6f5ef0d00edce22ea9662664.tar.gz | |
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
Diffstat (limited to 'Gemfile.rails5.lock')
0 files changed, 0 insertions, 0 deletions