diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-01 13:52:44 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-01 13:52:44 +0200 |
| commit | 4fa83bbe90ea1f3d2c2d0d75f50ca732e299651f (patch) | |
| tree | b0885b2e9459971553c4506f309fb86d422b4fd5 | |
| parent | 0bbf006454e47cb0411a0d035e45cda39739ca6f (diff) | |
| download | gitlab-ce-rc/fetch-before-finding-merge-base-in-ee_compat_check.tar.gz | |
Always fetch branches before finding the merge base, otherwise we could find an outdated merge baserc/fetch-before-finding-merge-base-in-ee_compat_check
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -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 |