diff options
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | content/_data/navigation.yaml | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 8b47e5ac..9914236d 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -63,7 +63,7 @@ default: # .rules_scheduled: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never - if: '$CI_PIPELINE_SOURCE != "schedule"' when: never @@ -80,7 +80,7 @@ default: .rules_scheduled_manual: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never - if: '$CI_PIPELINE_SOURCE == "schedule"' when: manual @@ -88,15 +88,13 @@ default: .rules_chores: rules: - - if: '$CLEAN_REVIEW_APPS_DAYS' - when: never - if: '$CI_PIPELINE_SOURCE == "schedule" && $CHORES_PIPELINE == "true"' when: manual allow_failure: true .rules_site_tests: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never # Don't run site tests for review apps. - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' @@ -108,7 +106,7 @@ default: .rules_global_nav_test: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' when: never @@ -119,7 +117,7 @@ default: .rules_prod: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never # Don't deploy to production for trigerred pipelines (usually review apps) - if: '$CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "trigger"' @@ -145,7 +143,7 @@ default: .rules_pages: rules: - - if: $CHORES_PIPELINE == "true" || $CLEAN_REVIEW_APPS_DAYS + - if: $CHORES_PIPELINE == "true" when: never # Don't deploy to production for trigerred pipelines (usually review apps) - if: '$CI_PIPELINE_SOURCE == "pipeline"|| $CI_PIPELINE_SOURCE == "trigger"' diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml index 5dd0c4e1..6a89dd56 100644 --- a/content/_data/navigation.yaml +++ b/content/_data/navigation.yaml @@ -2220,6 +2220,8 @@ sections: doc_url: 'ee/administration/integration/kroki.html' - doc_title: Mailgun doc_url: 'ee/administration/integration/mailgun.html' + - doc_title: Marketplace partners + doc_url: 'ee/integration/partner_marketplace.html' - doc_title: Mattermost notifications doc_url: 'ee/user/project/integrations/mattermost.html' - doc_title: Mattermost slash commands |