diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-01 13:00:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-01 13:00:05 +0000 |
| commit | c7583e72f967a55fb28d518bb8b0798897a683d4 (patch) | |
| tree | d83c2b534adfc7de4674a5a201cc2ac280420715 | |
| parent | 7a2509ea1ff9e740d0842827cb9713187172adde (diff) | |
| parent | 4fa83bbe90ea1f3d2c2d0d75f50ca732e299651f (diff) | |
| download | gitlab-ce-c7583e72f967a55fb28d518bb8b0798897a683d4.tar.gz | |
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
| -rw-r--r-- | lib/gitlab/ee_compat_check.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 85e6db0a689..72d7d4f84d1 100644 --- 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 |