summaryrefslogtreecommitdiff
path: root/features/support/env.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-19 13:07:58 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-19 13:07:58 +0300
commitaca574d0f414821a9a1bbdd0efe53b97cd42ca57 (patch)
tree3eb331bb74c2265d27c06b52224807805f6c4882 /features/support/env.rb
parente4bc359841d4254ad46a9e4c9a602cc25b017db1 (diff)
downloadgitlab-ce-aca574d0f414821a9a1bbdd0efe53b97cd42ca57.tar.gz
Ask coveralls to merge results
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features/support/env.rb')
-rw-r--r--features/support/env.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index 22f28987fe3..bb4249efe20 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -2,7 +2,7 @@ require 'simplecov' unless ENV['CI']
if ENV['TRAVIS']
require 'coveralls'
- Coveralls.wear!
+ Coveralls.wear_merged!
end
ENV['RAILS_ENV'] = 'test'