Commit c7583e72 authored by Sean McGivern's avatar Sean McGivern

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
parents 7a2509ea 4fa83bbe
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment