diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-14 18:01:45 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-14 18:01:45 +0000 |
| commit | 0b25368907fb1491b840d93ebb780b9ef2b130dd (patch) | |
| tree | 47d67e22ed0b0c724049562c4d83c910217113d5 /lib | |
| parent | 10a063e945b38e87f7a7d463d9d3a5dcd8ea736f (diff) | |
| parent | e8b5b082da28bff1c9728c913484bdf12f936b95 (diff) | |
| download | gitlab-ce-0b25368907fb1491b840d93ebb780b9ef2b130dd.tar.gz | |
Merge branch 'replace-npm-with-yarn' into 'master'
Replace NPM with Yarn
See merge request !9055
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/eslint.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/karma.rake | 2 |
2 files changed, 2 insertions, 2 deletions
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 |