diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-02 21:10:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-02 21:10:38 +0000 |
| commit | 3784a8d264a62a235a1c157a667d8d8ec30b6309 (patch) | |
| tree | 11e5be3faf4aa3e0b609a0f3d31e1b84999f8580 /zuul/driver/gitlab | |
| parent | 78cbfe9a189a1061dc865d3b9cdd0234547d845a (diff) | |
| parent | e03d8c887c092367b9ff2b00b48f244d4f6584f9 (diff) | |
| download | zuul-3784a8d264a62a235a1c157a667d8d8ec30b6309.tar.gz | |
Merge "Rename MERGER_FAILURE to MERGE_CONFLICT"
Diffstat (limited to 'zuul/driver/gitlab')
| -rw-r--r-- | zuul/driver/gitlab/gitlabreporter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zuul/driver/gitlab/gitlabreporter.py b/zuul/driver/gitlab/gitlabreporter.py index c3abf3dd8..f364521f5 100644 --- a/zuul/driver/gitlab/gitlabreporter.py +++ b/zuul/driver/gitlab/gitlabreporter.py @@ -69,7 +69,7 @@ class GitlabReporter(BaseReporter): if self._merge: self.mergeMR(item) if not item.change.is_merged: - msg = self._formatItemReportMergeFailure(item) + msg = self._formatItemReportMergeConflict(item) self.addMRComment(item, msg) def addMRComment(self, item, comment=None): |