From 8beb5998a8356feeb4ce75f7d749407bdd9034bc Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 7 Feb 2017 16:57:43 -0600
Subject: [PATCH] replace npm run calls with yarn

---
 .gitlab-ci.yml        | 6 +++---
 lib/tasks/eslint.rake | 2 +-
 lib/tasks/karma.rake  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1df95ba618..71d5dce7314 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,7 @@ setup-test-env:
   <<: *dedicated-runner
   stage: prepare
   script:
-    - npm install
+    - yarn install
     - bundle exec rake gitlab:assets:compile
     - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init'
   artifacts:
@@ -326,7 +326,7 @@ lint:javascript:
   stage: test
   image: "node:7.1"
   script:
-    - npm --silent run eslint
+    - yarn run eslint
 
 lint:javascript:report:
   <<: *dedicated-runner
@@ -337,7 +337,7 @@ lint:javascript:report:
   image: "node:7.1"
   script:
     - find app/ spec/ -name '*.js' -or -name '*.js.es6' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files
-    - npm --silent run eslint-report || true # ignore exit code
+    - yarn run eslint-report || true # ignore exit code
   artifacts:
     name: eslint-report
     expire_in: 31d
diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake
index d43cbad1909..2514b050695 100644
--- a/lib/tasks/eslint.rake
+++ b/lib/tasks/eslint.rake
@@ -1,7 +1,7 @@
 unless Rails.env.production?
   desc "GitLab | Run ESLint"
   task :eslint do
-    system("npm", "run", "eslint")
+    system("yarn", "run", "eslint")
   end
 end
 
diff --git a/lib/tasks/karma.rake b/lib/tasks/karma.rake
index 89812a179ec..35cfed9dc75 100644
--- a/lib/tasks/karma.rake
+++ b/lib/tasks/karma.rake
@@ -11,7 +11,7 @@ unless Rails.env.production?
 
     desc 'GitLab | Karma | Run JavaScript tests'
     task :tests do
-      sh "npm run karma" do |ok, res|
+      sh "yarn run karma" do |ok, res|
         abort('rake karma:tests failed') unless ok
       end
     end