diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 00:07:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 00:07:40 +0000 |
| commit | e8793358645d6c84b46ef56dafcbf834f20d6415 (patch) | |
| tree | c1c90c19c86b312a7def8dbdd2ddd8888b696d70 /.gitlab | |
| parent | e0b84f4ba4b44c8ecf00be97843c40df2550b74c (diff) | |
| download | gitlab-ce-e8793358645d6c84b46ef56dafcbf834f20d6415.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/review.gitlab-ci.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 0c7d2318009..5a58c3f9416 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,10 +1,10 @@ # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_PIPELINE_SOURCE == "schedule"' # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_MERGE_REQUEST_IID' # Make sure to update all the similar patterns in other CI config files if you modify these patterns .code-patterns: &code-patterns diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index a42a927c6b9..ad045d6c974 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -1,10 +1,10 @@ # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_PIPELINE_SOURCE == "schedule"' # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_MERGE_REQUEST_IID' # Make sure to update all the similar patterns in other CI config files if you modify these patterns .code-qa-patterns: &code-qa-patterns |