From aca574d0f414821a9a1bbdd0efe53b97cd42ca57 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 19 Sep 2014 13:07:58 +0300
Subject: Ask coveralls to merge results

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/support/env.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'features/support/env.rb')

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'
-- 
cgit v1.2.1