diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3d2adcd..e397eb25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1364,27 +1364,6 @@ freebsd:14.2@default-build: # # ################################################################# -# -# Verify that the merge request has the allow-collaboration checkbox ticked -# - -check-merge-request: - extends: - - .fdo.ci-fairy - - .policy - - .fdo-runner-tags - stage: deploy - script: - - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml - artifacts: - when: on_failure - reports: - junit: results.xml - allow_failure: true - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - build rpm: extends: - .fdo.distribution-image@fedora diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 50752081..4ae21e0c 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -761,27 +761,6 @@ coverity: # # ################################################################# -# -# Verify that the merge request has the allow-collaboration checkbox ticked -# - -check-merge-request: - extends: - - .fdo.ci-fairy - - .policy - - .fdo-runner-tags - stage: deploy - script: - - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml - artifacts: - when: on_failure - reports: - junit: results.xml - allow_failure: true - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - - {% for distro in distributions if distro.name == "fedora" %} {% set version = "{}".format(distro.versions|last()) %} build rpm: