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 gitlab-org/gitlab-ce!16990

Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master'
1587e334 · Marin Jankovski · Mark Fletcher · 6ea755fa · 1587e334
Commit 1587e334 authored Feb 08, 2018 by Marin Jankovski Committed by Mark Fletcher Feb 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

merge_request.rb app/models/merge_request.rb +5 -3

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -158,10 +158,12 @@ class MergeRequest < ActiveRecord::Base
  end

  def rebase_in_progress?
-    # The source project can be deleted
-    return false unless source_project
+    strong_memoize(:rebase_in_progress) do
+      # The source project can be deleted
+      next false unless source_project

-    source_project.repository.rebase_in_progress?(id)
+      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