diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 15:10:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 15:10:16 +0300 |
| commit | 5c8c561ac63d7b8f372316b4409500474220fcda (patch) | |
| tree | 20586ba87f12052ee507171b07f61dd21d9f1fd8 /.gitlab | |
| parent | b1b7c2f9a744197a111c81719c546a474adab4e8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index ff7ca52244e..87ca984416f 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -78,6 +78,7 @@ - "{,ee/}rubocop/**/*" - "{,ee/}spec/**/*" - "doc/README.md" # Some RSpec test rely on this file + - "doc/administration/raketasks/maintenance.md" # Some RSpec test rely on this file .code-patterns: &code-patterns - "{package.json,yarn.lock}" @@ -121,6 +122,7 @@ - "{,ee/}rubocop/**/*" - "{,ee/}spec/**/*" - "doc/README.md" # Some RSpec test rely on this file + - "doc/administration/raketasks/maintenance.md" # Some RSpec test rely on this file .code-qa-patterns: &code-qa-patterns - "{package.json,yarn.lock}" @@ -163,6 +165,7 @@ - "{,ee/}rubocop/**/*" - "{,ee/}spec/**/*" - "doc/README.md" # Some RSpec test rely on this file + - "doc/administration/raketasks/maintenance.md" # Some RSpec test rely on this file # QA changes - ".dockerignore" - "qa/**/*" @@ -500,14 +503,6 @@ - <<: *if-dot-com-gitlab-org-schedule when: on_success -.review:rules:review-gcp-cleanup: - rules: - - <<: *if-dot-com-gitlab-org-merge-request - changes: *code-qa-patterns - when: manual - - <<: *if-dot-com-gitlab-org-schedule - when: on_success - .review:rules:danger: rules: - if: '$DANGER_GITLAB_API_TOKEN && $CI_MERGE_REQUEST_IID' |