Commit a89af6ab authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents 6cb4e488 560c3280
...@@ -4,7 +4,7 @@ end ...@@ -4,7 +4,7 @@ end
if ENV['COVERALLS'] if ENV['COVERALLS']
require 'coveralls' require 'coveralls'
Coveralls.wear_merged!('rails') Coveralls.wear_merged!
end end
ENV['RAILS_ENV'] = 'test' ENV['RAILS_ENV'] = 'test'
......
...@@ -9,5 +9,5 @@ unless Rails.env.production? ...@@ -9,5 +9,5 @@ unless Rails.env.production?
require 'coveralls/rake/task' require 'coveralls/rake/task'
Coveralls::RakeTask.new Coveralls::RakeTask.new
desc "GITLAB | Run all tests on CI with simplecov" desc "GITLAB | Run all tests on CI with simplecov"
task :test_ci => [:spec, :spinach, 'coveralls:push'] task :test_ci => [:spinach, :spec, 'coveralls:push']
end end
...@@ -4,7 +4,7 @@ end ...@@ -4,7 +4,7 @@ end
if ENV['COVERALLS'] if ENV['COVERALLS']
require 'coveralls' require 'coveralls'
Coveralls.wear_merged!('rails') Coveralls.wear_merged!
end end
ENV["RAILS_ENV"] ||= 'test' ENV["RAILS_ENV"] ||= 'test'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment