diff options
author | Marin Jankovski <marin@gitlab.com> | 2018-03-16 17:28:31 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2018-03-16 17:28:31 +0000 |
commit | 9fd2d9ea243e8691c7a7aa9575256ac636d59792 (patch) | |
tree | a8ebfaf60b15c2b2eb299e13f7d140ac923280fc | |
parent | f864fb46da83058c7f92ec889dd7914cc8bcec09 (diff) | |
parent | f2cc309f7985285bcf34bea2c2a7de02df129d85 (diff) | |
download | gitlab-ce-9fd2d9ea243e8691c7a7aa9575256ac636d59792.tar.gz |
Merge branch 'toon-master-patch-57286' into 'master'
Rename manual job to `package-and-qa`
See merge request gitlab-org/gitlab-ce!17807
-rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5556bf5bc0b..724e37141d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -257,7 +257,7 @@ stages: ## # Trigger a package build in omnibus-gitlab repository # -package-qa: +package-and-qa: <<: *dedicated-runner image: ruby:2.4-alpine before_script: [] |