Merge branch 'toon-master-patch-57286' into 'master'

maxlazio · maxlazio · commit 9fd2d9ea243e · 2018-03-16T17:28:31.000Z
Rename manual job to `package-and-qa`

See merge request gitlab-org/gitlab-ce!17807
diff --git 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: []

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ stages:`
`257`	`257`	`##`
`258`	`258`	`# Trigger a package build in omnibus-gitlab repository`
`259`	`259`	`#`
`260`		`-package-qa:`
	`260`	`+package-and-qa:`
`261`	`261`	`<<: *dedicated-runner`
`262`	`262`	`image: ruby:2.4-alpine`
`263`	`263`	`before_script: []`