diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 15:06:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-05 15:06:17 +0000 |
| commit | 4c464055fbcdab02bb8334b148c0e35b981b239e (patch) | |
| tree | 861562d77b4e8684d0498f25979d8ac85dd8f25a /.gitlab | |
| parent | 791785af5540d18eaa97da24f9ff8638e1960b72 (diff) | |
| download | gitlab-ce-4c464055fbcdab02bb8334b148c0e35b981b239e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/docs.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/global.gitlab-ci.yml | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 00013d5d2ba..07375fca611 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -75,7 +75,7 @@ graphql-reference-verify: - .default-cache - .default-only - .default-before_script - - .only:changes-graphql + - .only:changes-code-backstage-qa - .use-pg9 stage: test needs: ["setup-test-env"] diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index f46638e0c4c..d746d8fe030 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -93,6 +93,7 @@ - "config.ru" - "{package.json,yarn.lock}" - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*" + - "doc/api/graphql/**/*" .backstage-patterns: &backstage-patterns - "Dangerfile" @@ -111,11 +112,6 @@ - "doc/**/*" - ".markdownlint.json" -.graphql-patterns: &graphql-patterns - - "{,ee/}app/graphql/**/*" - - "{,ee/}lib/gitlab/graphql/**/*" - - "doc/api/graphql/**/*" - .only:changes-code: only: changes: *code-patterns @@ -128,10 +124,6 @@ only: changes: *docs-patterns -.only:changes-graphql: - only: - changes: *graphql-patterns - .only:changes-code-backstage: only: changes: @@ -147,6 +139,7 @@ - "config.ru" - "{package.json,yarn.lock}" - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*" + - "doc/api/graphql/**/*" # Backstage changes - "Dangerfile" - "danger/**/*" @@ -170,6 +163,7 @@ - "config.ru" - "{package.json,yarn.lock}" - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*" + - "doc/api/graphql/**/*" # QA changes - ".dockerignore" - "qa/**/*" @@ -189,6 +183,7 @@ - "config.ru" - "{package.json,yarn.lock}" - "{,ee/}{app,bin,config,db,haml_lint,lib,locale,public,scripts,symbol,vendor}/**/*" + - "doc/api/graphql/**/*" # Backstage changes - "Dangerfile" - "danger/**/*" |