root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Always fetch branches before finding the merge base, otherwise we could find an outdated merge base 

Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2017-08-01 13:52:44 +02:00
parent 0bbf006454
commit 4fa83bbe90
No known key found for this signature in database
GPG Key ID: 46DF07E5CD9E96AB
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/ee_compat_check.rb
View File

@ -181,8 +181,6 @@ module Gitlab
end end
def find_merge_base_with_master(branch:) 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) # 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 # In total we go (20 + 54 + 148 + 403 = 625) commits deeper
depth = 20 depth = 20