diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 12:10:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-25 12:10:16 +0300 |
| commit | acad0870f7fd0cfe163a9d3a248a4a3eb8ca343d (patch) | |
| tree | afc7b07db38fbc23a5becced3244776578b01d55 /.gitlab | |
| parent | ccb37f9759b534764404b50e31daf8c18e6def91 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/CODEOWNERS | 1 | ||||
| -rw-r--r-- | .gitlab/ci/cng/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 60abdd95e66..e1fc280bd1c 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -874,6 +874,7 @@ lib/gitlab/checks/** /doc/user/award_emojis.md @msedlakjakubowski /doc/user/clusters/ @phillipwells /doc/user/compliance/ @rdickenson +/doc/user/compliance/compliance_center/ @eread /doc/user/compliance/compliance_report/ @eread /doc/user/compliance/index.md @eread /doc/user/crm/ @msedlakjakubowski diff --git a/.gitlab/ci/cng/main.gitlab-ci.yml b/.gitlab/ci/cng/main.gitlab-ci.yml index bee502e3b0b..208567f569b 100644 --- a/.gitlab/ci/cng/main.gitlab-ci.yml +++ b/.gitlab/ci/cng/main.gitlab-ci.yml @@ -56,6 +56,6 @@ include: GITALY_SERVER_VERSION: "${GITALY_SERVER_VERSION}" RUBY_VERSION: "${FULL_RUBY_VERSION}" trigger: - project: gitlab-org/build/CNG-mirror + project: ${CI_PROJECT_NAMESPACE}/build/CNG-mirror branch: $TRIGGER_BRANCH strategy: depend diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index c60bc2bcb1f..5ee4d275540 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1167,6 +1167,8 @@ - <<: *if-merge-request-labels-run-all-e2e - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e changes: *feature-flag-development-config-patterns + - <<: *if-merge-request + changes: *dependency-patterns - <<: *if-force-ci .frontend:rules:compile-production-assets-as-if-foss: |