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>
2017-08-01 13:52:44 +02:00 · 2017-08-01 13:52:44 +02:00 · 4fa83bbe90
commit 4fa83bbe90
parent 0bbf006454
1 changed files with 0 additions and 2 deletions
--- 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