summaryrefslogtreecommitdiff
path: root/lib/tasks/karma.rake
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-02-16 13:10:32 +1100
committerSimon Knox <psimyn@gmail.com>2017-02-16 13:10:32 +1100
commit8a928af0fc54a84c5b858955e7459512155d4af0 (patch)
tree4c55ff6c1cd20405e9adf5973e2ce1c229fcebde /lib/tasks/karma.rake
parent3f713db0da2602152aa482b57f84b7418fd20a93 (diff)
parentb05e75b8faccc50749adc63419074c91802a8f50 (diff)
downloadgitlab-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/karma.rake')
-rw-r--r--lib/tasks/karma.rake2
1 files changed, 1 insertions, 1 deletions
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