Commit 297b075b authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master'

Memoize MergeRequest#rebase_in_progress? to prevent N+1 queries in Gitaly

Closes gitlab-ee#4857

See merge request !16990
parents 2d3867d0 9a323c7e
Pipeline #17258055 passed with stages
in 31 minutes and 1 second
......@@ -158,11 +158,13 @@ class MergeRequest < ActiveRecord::Base
end
def rebase_in_progress?
strong_memoize(:rebase_in_progress) do
# The source project can be deleted
return false unless source_project
next false unless source_project
source_project.repository.rebase_in_progress?(id)
end
end
# Use this method whenever you need to make sure the head_pipeline is synced with the
# branch head commit, for example checking if a merge request can be merged.
......
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