diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 21:09:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 21:09:51 +0300 |
| commit | 9ee2305f46a2b3d1d1e8a1f1182512599a74dbe1 (patch) | |
| tree | 82c0631433839156f7d2fa88a5026c385b2b5703 /.gitlab | |
| parent | 9498dc957345829f29fe0bc4e55c969783b457be (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/CODEOWNERS | 3 | ||||
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 7a020838c22..03054f0381a 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -362,7 +362,8 @@ Dangerfile ^[Legal] @gitlab-org/legal-reviewers /config/dependency_decisions.yml -^[Workhorse] @nolith @patrickbajao @igor.drozdov +# https://gitlab.com/groups/gitlab-org/maintainers/gitlab-workhorse/-/group_members?with_inherited_permissions=exclude +^[Workhorse] @gitlab-org/maintainers/gitlab-workhorse /workhorse/ [Application Security] @gitlab-com/gl-security/appsec diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index cd03a27ebc1..ebf4c8e16bb 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -85,6 +85,7 @@ trigger-omnibus: - .qa:rules:package-and-test-ee needs: - trigger-omnibus-env + - build-assets-image inherit: variables: false variables: @@ -118,6 +119,7 @@ trigger-omnibus as-if-foss: - .qa:rules:package-and-test-ce needs: - trigger-omnibus-env as-if-foss + - build-assets-image as-if-foss variables: # Override gitlab repository so that omnibus doesn't use foss repository for CE build GITLAB_ALTERNATIVE_REPO: $CI_PROJECT_URL |