diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-03-11 15:06:37 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-03-11 15:06:37 +0000 |
commit | 5a84e8381ac7e8dc0ecef7b7af83553161033e3c (patch) | |
tree | 1f5802f1ce3ac2dbb395b4442ff60622acd080e2 /lib | |
parent | c814421f2a1f1a2fba1acfe178a1f96da5e1e5e4 (diff) | |
parent | d69dff5b4b1c2dd4944269703ff7af32869adf13 (diff) | |
download | gitlab-ce-5a84e8381ac7e8dc0ecef7b7af83553161033e3c.tar.gz |
Merge branch 'remove-benchmark-suite' into 'master'
Removed benchmark suite and its documentation
Related issue: gitlab-org/gitlab-ce#13718
See merge request !3137
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tasks/spec.rake | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/tasks/spec.rake b/lib/tasks/spec.rake index 0985ef3a669..2cf7a25a0fd 100644 --- a/lib/tasks/spec.rake +++ b/lib/tasks/spec.rake @@ -46,20 +46,11 @@ namespace :spec do run_commands(cmds) end - desc 'GitLab | Rspec | Run benchmark specs' - task :benchmark do - cmds = [ - %W(rake gitlab:setup), - %W(rspec spec --tag @benchmark) - ] - run_commands(cmds) - end - desc 'GitLab | Rspec | Run other specs' task :other do cmds = [ %W(rake gitlab:setup), - %W(rspec spec --tag ~@api --tag ~@feature --tag ~@models --tag ~@lib --tag ~@services --tag ~@benchmark) + %W(rspec spec --tag ~@api --tag ~@feature --tag ~@models --tag ~@lib --tag ~@services) ] run_commands(cmds) end @@ -69,7 +60,7 @@ desc "GitLab | Run specs" task :spec do cmds = [ %W(rake gitlab:setup), - %W(rspec spec --tag ~@benchmark), + %W(rspec spec), ] run_commands(cmds) end |