From dfacd3a02da14075c85d7d5a89c453dfef37a800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= <matteeyah@gmail.com>
Date: Fri, 15 Mar 2019 15:38:18 +0100
Subject: [PATCH] Move gitlab-org specific config to .gitlab-ci.yml

---
 .gitlab-ci.yml                                     | 8 ++++++++
 lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc35c598332..6c3862c7645 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -777,6 +777,14 @@ jest:
 
 code_quality:
   <<: *dedicated-no-docs-no-db-pull-cache-job
+  # gitlab-org runners set `privileged: false` but we need to have it set to true
+  # since we're using Docker in Docker
+  tags: []
+  before_script: []
+  cache: {}
+  dependencies: []
+  variables:
+    SETUP_DB: "false"
 
 sast:
   <<: *dedicated-no-docs-no-db-pull-cache-job
diff --git a/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml
index ebb01ae19ca..10b25af904f 100644
--- a/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml
@@ -1,17 +1,10 @@
 code_quality:
   image: docker:stable
   allow_failure: true
-  # gitlab-org runners set `privileged: false` but we need to have it set to true
-  # since we're using Docker in Docker
-  tags: []
-  before_script: []
   services:
     - docker:stable-dind
   variables:
-    SETUP_DB: "false"
     DOCKER_DRIVER: overlay2
-  cache: {}
-  dependencies: []
   script:
     - docker run
         --env SOURCE_CODE="$PWD"