/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: Jelmer Vernooij
  • Date: 2020-06-01 19:35:12 UTC
  • mfrom: (7490.29.10 work)
  • mto: This revision was merged to the branch mainline in revision 7507.
  • Revision ID: jelmer@jelmer.uk-20200601193512-yx77edrbrs12d0qy
Merge lp:brz/3.1.

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