diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 12:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 12:07:45 +0300 |
commit | f4186a753b86625a83e8499af14b5badd63a2ac2 (patch) | |
tree | b960dd9f4255e9eee9f87d28e853f163836aa4c5 /app/models/merge_request.rb | |
parent | 0221116862ee66024a03492b4fbbe4e069d84303 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 0bc4e550678..26e3c8f38f6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1251,7 +1251,7 @@ class MergeRequest < ApplicationRecord def all_pipelines strong_memoize(:all_pipelines) do - MergeRequest::Pipelines.new(self).all + Ci::PipelinesForMergeRequestFinder.new(self).all end end |