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

features/support/env.rb

@@ -4,7 +4,7 @@ end
 
 if ENV['COVERALLS']
   require 'coveralls'
-  Coveralls.wear_merged!('rails')
+  Coveralls.wear_merged!
 end
 
 ENV['RAILS_ENV'] = 'test'

lib/tasks/test.rake

@@ -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

spec/spec_helper.rb

@@ -4,7 +4,7 @@ end
 
 if ENV['COVERALLS']
   require 'coveralls'
-  Coveralls.wear_merged!('rails')
+  Coveralls.wear_merged!
 end
 
 ENV["RAILS_ENV"] ||= 'test'