From 221dccab97766be810d87c6eb1d120145b41b364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 4 May 2017 16:34:52 +0200
Subject: [PATCH] Include the bundler:audit job into the static-analysis job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml          | 12 ------------
 scripts/static-analysis |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f665f19132..44620d390ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -412,18 +412,6 @@ rake karma:
     paths:
     - coverage-javascript/
 
-bundler:audit:
-  stage: test
-  <<: *ruby-static-analysis
-  <<: *dedicated-runner
-  only:
-    - master@gitlab-org/gitlab-ce
-    - master@gitlab-org/gitlab-ee
-    - master@gitlab/gitlabhq
-    - master@gitlab/gitlab-ee
-  script:
-    - "bundle exec bundle-audit check --update --ignore CVE-2016-4658"
-
 .migration-paths: &migration-paths
   stage: test
   <<: *dedicated-runner
diff --git a/scripts/static-analysis b/scripts/static-analysis
index 1bd6b339830..7dc8f679036 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -3,6 +3,7 @@
 require ::File.expand_path('../lib/gitlab/popen', __dir__)
 
 tasks = [
+  %w[bundle exec bundle-audit check --update --ignore CVE-2016-4658],
   %w[bundle exec rake config_lint],
   %w[bundle exec rake flay],
   %w[bundle exec rake haml_lint],