/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/gitlab/hoster.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-01 19:47:17 UTC
  • mfrom: (7506.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200601194717-8mco90rhp2v1dbgj
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/384927

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/gitlab/hoster.py
250
250
            return False
251
251
        elif self._mr['merge_status'] == 'can_be_merged':
252
252
            return True
 
253
        elif self._mr['merge_status'] in (
 
254
                'unchecked', 'cannot_be_merged_recheck'):
 
255
            # See https://gitlab.com/gitlab-org/gitlab/-/commit/7517105303c for
 
256
            # an explanation of the distinction between unchecked and
 
257
            # cannot_be_merged_recheck
 
258
            return None
253
259
        else:
254
260
            raise ValueError(self._mr['merge_status'])
255
261