Commit a89af6ab authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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

parents 6cb4e488 560c3280
......@@ -4,7 +4,7 @@
 
if ENV['COVERALLS']
require 'coveralls'
Coveralls.wear_merged!('rails')
Coveralls.wear_merged!
end
 
ENV['RAILS_ENV'] = 'test'
......
......@@ -9,5 +9,5 @@ unless Rails.env.production?
require 'coveralls/rake/task'
Coveralls::RakeTask.new
desc "GITLAB | Run all tests on CI with simplecov"
task :test_ci => [:spec, :spinach, 'coveralls:push']
task :test_ci => [:spinach, :spec, 'coveralls:push']
end
......@@ -4,7 +4,7 @@
 
if ENV['COVERALLS']
require 'coveralls'
Coveralls.wear_merged!('rails')
Coveralls.wear_merged!
end
 
ENV["RAILS_ENV"] ||= 'test'
......
Supports Markdown
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