kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

See merge request !13226
This commit is contained in:
Sean McGivern 2017-08-01 13:00:05 +00:00
commit c7583e72f9
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
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