Merge pull request #155 from varyonic/git-merge-fixes

namanbansal · web-flow · commit 5d5d9b668fc5 · 2018-06-16T03:26:23.000+05:30
Finish removing coveralls
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ Gemfile.lock
 .ruby-*
 .idea
 gemfiles/*.lock
+/coverage/
diff --git a/.simplecov b/.simplecov
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-gem 'coveralls', require: false
+
 gemspec
diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", require: false
 gem "rails", "4.2.6"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_50.gemfile b/gemfiles/rails_50.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", require: false
 gem "rails", "~> 5.0", ">= 5.0.3"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_51.gemfile b/gemfiles/rails_51.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", require: false
 gem "rails", "~> 5.1", ">= 5.1.1"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_52.gemfile b/gemfiles/rails_52.gemfile
@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", require: false
 gem "rails", "~> 5.2.0.beta2"
 
 gemspec path: "../"

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 source 'https://rubygems.org'
 -gem 'coveralls', require: false
++
 gemspec