Merge pull request #5227 from CocoaPods/seg-danger-no-merges

[Danger] Fail if there are merges from upstream in the PR

Dangerfile

@@ -8,3 +8,7 @@
     fail("`fdescribe` left in tests (#{file})") if contents =~ /^\w*fdescribe/
   end
 end
+
+if commits.any? { |c| c.message =~ /^Merge branch '#{branch_for_merge}'/ }
+  fail("Please rebase to get rid of the merge commits in this PR")
+end

Gemfile.lock

@@ -121,7 +121,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.4.0)
     ast (2.2.0)
     awesome_print (1.6.1)
     bacon (1.2.0)
@@ -136,7 +136,7 @@ GEM
     colored (1.2)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    danger (0.7.2)
+    danger (0.7.4)
       claide
       colored (~> 1.2)
       faraday
@@ -263,4 +263,4 @@ DEPENDENCIES
   xcodeproj!
 
 BUNDLED WITH
-   1.11.2
+   1.12.1

spec/integration.rb

@@ -139,7 +139,7 @@ describe_cli 'pod' do
     s.replace_pattern /git checkout -b <new-branch-name>/, 'git checkout -b new_branch_name'
 
     # git sometimes prints this, but not always ¯\_(ツ)_/¯
-    s.replace_pattern /^\s*Checking out files.*done\.[\n]?/, ''
+    s.replace_pattern /^\s*Checking out files.*done\./, ''
 
     s.replace_path %r{
       `[^`]*? # The opening backtick on a plugin path