summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2015-07-08 19:01:59 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2015-07-08 19:01:59 +0000
commitd991e3e41a83c9479d0f5d95732f998cf352c57d (patch)
tree5041dd14c421a3f4ff3bf26724dd4e30e5febaf4
parentad12c1264d38722be08df533a558e8c8f19c0940 (diff)
parent6d56bd86906969589a7f1e2619d75c0a6a03e041 (diff)
downloadgitlab-ce-d991e3e41a83c9479d0f5d95732f998cf352c57d.tar.gz
Merge branch 'use_teaspoon' into 'master'
use teaspoon instead of jasmine:ci use teaspoon instead of jasmine:ci while launching local test see 18ef9befc0de176d6b7bf7daa3f364e38c3d768f See merge request !941
-rw-r--r--lib/tasks/gitlab/test.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake
index cbb3d61af04..4d4e746503a 100644
--- a/lib/tasks/gitlab/test.rake
+++ b/lib/tasks/gitlab/test.rake
@@ -6,7 +6,7 @@ namespace :gitlab do
%W(rake rubocop),
%W(rake spinach),
%W(rake spec),
- %W(rake jasmine:ci)
+ %W(rake teaspoon)
]
cmds.each do |cmd|