diff options
Diffstat (limited to 'lib/gitlab/checks/force_push.rb')
-rw-r--r-- | lib/gitlab/checks/force_push.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/lib/gitlab/checks/force_push.rb b/lib/gitlab/checks/force_push.rb index 1e73f89158d..c9c3050cfc2 100644 --- a/lib/gitlab/checks/force_push.rb +++ b/lib/gitlab/checks/force_push.rb @@ -5,12 +5,19 @@ module Gitlab return false if project.empty_repo? # Created or deleted branch - if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev) - false - else - Gitlab::Git::RevList.new( - path_to_repo: project.repository.path_to_repo, - oldrev: oldrev, newrev: newrev).missed_ref.present? + return false if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev) + + GitalyClient.migrate(:force_push) do |is_enabled| + if is_enabled + !project + .repository + .gitaly_commit_client + .ancestor?(oldrev, newrev) + else + Gitlab::Git::RevList.new( + project.repository.raw, oldrev: oldrev, newrev: newrev + ).missed_ref.present? + end end end end |