diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 18:09:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-26 18:09:04 +0300 |
| commit | ee24c7d68f57a67754a5d1e2ea99f688029d14bd (patch) | |
| tree | 8391744a26dd3f77c4bb1bbb55672ba0e066d969 /.gitlab | |
| parent | a1c0b634f78f51389fd3ec390a1803afa3de49a2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab/ci/vendored-gems.gitlab-ci.yml | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 36a22ea8bb5..58a394e160a 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1800,6 +1800,12 @@ changes: ["vendor/gems/devise-pbkdf2-encryptable/**/*"] - <<: *if-merge-request-labels-run-all-rspec +.vendor:rules:gitlab_active_record: + rules: + - <<: *if-merge-request + changes: ["vendor/gems/gitlab_active_record/**/*"] + - <<: *if-merge-request-labels-run-all-rspec + .vendor:rules:bundler-checksum: rules: - <<: *if-merge-request diff --git a/.gitlab/ci/vendored-gems.gitlab-ci.yml b/.gitlab/ci/vendored-gems.gitlab-ci.yml index a22ac5337f6..1086d9074d2 100644 --- a/.gitlab/ci/vendored-gems.gitlab-ci.yml +++ b/.gitlab/ci/vendored-gems.gitlab-ci.yml @@ -85,3 +85,11 @@ vendor bundler-checksum: trigger: include: vendor/gems/bundler-checksum/.gitlab-ci.yml strategy: depend + +vendor gitlab_active_record: + extends: + - .vendor:rules:gitlab_active_record + needs: [] + trigger: + include: vendor/gems/gitlab_active_record/.gitlab-ci.yml + strategy: depend |