summaryrefslogtreecommitdiff
path: root/lib/tasks/dev.rake
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 15:17:11 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 15:17:11 +0000
commitb902a9b83d71738c8b5fc0c1c461119e56100b07 (patch)
tree0e92793ca2ef7eea73dce5f7fdc7427d6a54d608 /lib/tasks/dev.rake
parent541f7675f9a72a7156811ccc6cd58171b7583934 (diff)
parentb8f12d1917d2befe17cf8e8f47fb70a1bb6a99ff (diff)
downloadgitlab-ce-b902a9b83d71738c8b5fc0c1c461119e56100b07.tar.gz
Merge branch 'split-tests' into 'master'
Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
Diffstat (limited to 'lib/tasks/dev.rake')
-rw-r--r--lib/tasks/dev.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index b22c631c8ba..6f27972c4e4 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,14 +1,14 @@
task dev: ["dev:setup"]
namespace :dev do
- desc "GITLAB | Setup developer environment (db, fixtures)"
+ desc "GitLab | Setup developer environment (db, fixtures)"
task :setup => :environment do
ENV['force'] = 'yes'
Rake::Task["gitlab:setup"].invoke
Rake::Task["gitlab:shell:setup"].invoke
end
- desc 'GITLAB | Start/restart foreman and watch for changes'
+ desc 'GitLab | Start/restart foreman and watch for changes'
task :foreman => :environment do
sh 'rerun --dir app,config,lib -- foreman start'
end