Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into 'master'

Always fetch branches before finding the merge base, otherwise we could find an outdated merge base See merge request !13226

Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into 'master'
c7583e72 · Sean McGivern · 7a2509ea · 4fa83bbe · c7583e72
Commit c7583e72 authored Aug 01, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

ee_compat_check.rb lib/gitlab/ee_compat_check.rb +0 -2

No files found.
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -181,8 +181,6 @@ module Gitlab
    end

    def find_merge_base_with_master(branch:)
-      return if merge_base_found?
-
      # Start with (Math.exp(3).to_i = 20) until (Math.exp(6).to_i = 403)
      # In total we go (20 + 54 + 148 + 403 = 625) commits deeper
      depth = 20