diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-02-16 13:10:32 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-02-16 13:10:32 +1100 |
| commit | 8a928af0fc54a84c5b858955e7459512155d4af0 (patch) | |
| tree | 4c55ff6c1cd20405e9adf5973e2ce1c229fcebde /lib/tasks | |
| parent | 3f713db0da2602152aa482b57f84b7418fd20a93 (diff) | |
| parent | b05e75b8faccc50749adc63419074c91802a8f50 (diff) | |
| download | gitlab-ce-task_list_refactor.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactor
Diffstat (limited to 'lib/tasks')
| -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 |