Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

gitlabhq · Jul 14, 2015 · c013a9d · c013a9d
2 parents 6114aed + 87e6786
commit c013a9d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,15 @@
+if ENV['SIMPLECOV']
+  require 'simplecov'
+  SimpleCov.start :rails
+end
+
+if ENV['COVERALLS']
+  require 'coveralls'
+  Coveralls.wear_merged!
+end
+
 ENV["RAILS_ENV"] ||= 'test'
+
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 require 'shoulda/matchers'

diff --git a/spec/support/coverage.rb b/spec/support/coverage.rb