Use StrongMemoize for Ci::Build#merge_request

050178e1 · drew cimino · ef4a021f · 050178e1
Commit 050178e1 authored Mar 19, 2020 by drew cimino
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 11 deletions

app/models/ci/build.rb app/models/ci/build.rb +7 -11

No files found.
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -598,13 +598,9 @@ module Ci
    end
    def merge_request
-      return @merge_request if defined?(@merge_request)
+      strong_memoize(:merge_request) do
-      @merge_request ||=
-        begin
        merge_requests = MergeRequest.includes(:latest_merge_request_diff)
-            .where(source_branch: ref,
+          .where(source_branch: ref, source_project: pipeline.project)
-                   source_project: pipeline.project)
          .reorder(iid: :desc)
        merge_requests.find do |merge_request|