diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-08-31 20:50:05 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-08-31 20:50:05 -0700 |
| commit | f045903541ace5cf4fd3c6e4a05ecfd264c1c621 (patch) | |
| tree | ee6aaf013d92766e7184b3e0772e1e5fa99a20e4 /.gitlab-ci.yml | |
| parent | f2c60eba25fc001974a61373bc380528416932a2 (diff) | |
| parent | 8713afe61fb1beaff4d550a60b88d274c47006ea (diff) | |
| download | gitlab-ce-f045903541ace5cf4fd3c6e4a05ecfd264c1c621.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92ed11db240..9fd42386b95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,19 +68,6 @@ stages: - mysql:latest - redis:alpine -.only-if-want-mysql: &only-if-want-mysql - only: - - /mysql/ - - /-stable/ - - master@gitlab-org/gitlab-ce - - master@gitlab-org/gitlab-ee - - master@gitlab/gitlabhq - - master@gitlab/gitlab-ee - - tags@gitlab-org/gitlab-ce - - tags@gitlab-org/gitlab-ee - - tags@gitlab/gitlabhq - - tags@gitlab/gitlab-ee - # Skip all jobs except the ones that begin with 'docs/'. # Used for commits including ONLY documentation changes. # https://docs.gitlab.com/ce/development/writing_documentation.html#testing @@ -124,7 +111,6 @@ stages: .rspec-metadata-mysql: &rspec-metadata-mysql <<: *rspec-metadata <<: *use-mysql - <<: *only-if-want-mysql <<: *except-docs .spinach-metadata: &spinach-metadata @@ -156,7 +142,6 @@ stages: .spinach-metadata-mysql: &spinach-metadata-mysql <<: *spinach-metadata <<: *use-mysql - <<: *only-if-want-mysql <<: *except-docs .only-canonical-masters: &only-canonical-masters |