diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-14 21:11:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-14 21:11:03 +0300 |
| commit | 3da283df313b950685c1513b6b69a68de9c4ab11 (patch) | |
| tree | 046edea54a5ea4945d7115ebb6552d55532eec38 /.gitlab | |
| parent | 2aea9a0c91723b8800b016335930c59390cda7c9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/CODEOWNERS | 1 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 8537dac7547..58e481dea77 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -1103,7 +1103,6 @@ lib/gitlab/checks/** /ee/app/assets/javascripts/access_tokens/ /ee/app/assets/javascripts/audit_events/components/tokens/ /ee/app/assets/javascripts/audit_events/token_utils.js -/ee/app/assets/javascripts/batch_comments/ /ee/app/assets/javascripts/groups/settings/components/ /ee/app/assets/javascripts/pages/admin/application_settings/general/components/ /ee/app/assets/javascripts/pages/groups/omniauth_callbacks/ diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 6b6dd6bef60..f1905742ac6 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -613,6 +613,8 @@ .as-if-jh-default-exclusion-rules: rules: + - if: '$ADD_JH_FILES_TOKEN == null' + when: never - <<: *if-security-merge-request when: never - <<: *if-merge-request-targeting-stable-branch diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index bd5fdf78a63..8937ee44638 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -134,12 +134,12 @@ gdk-qa-smoke-with-load-balancer: variables: QA_SCENARIO: Test::Instance::Smoke QA_RUN_TYPE: gdk-qa-smoke + allow_failure: true rules: - changes: - ".gitlab/ci/test-on-gdk/**" - "lib/gitlab/database/load_balancing/**/*" -# TODO: set non manual once smoke tests prove to be stable gdk-qa-reliable: extends: - .gdk-qa-base @@ -149,7 +149,7 @@ gdk-qa-reliable: QA_RUN_TYPE: gdk-qa-blocking allow_failure: true rules: - - when: manual + - when: always gdk-qa-reliable-with-load-balancer: extends: |