diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 22:52:23 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 22:52:23 +0000 |
commit | fa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0 (patch) | |
tree | 07c2087939b6c6dce33620c57a6989d76547e681 /app/models/merge_request.rb | |
parent | 204dca4436f5b2c82611a873d05186ec4ff4c17c (diff) | |
parent | 2f003b58645b3cbc987c240f844b1ff6eb0c026a (diff) | |
download | gitlab-ce-fa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0.tar.gz |
Merge branch '11-11-stable-prepare-rc2' into '11-11-stable'
Prepare 11.11.0-rc2 release
See merge request gitlab-org/gitlab-ce!28215
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index c2a1487fc6e..df162e4844c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -66,7 +66,7 @@ class MergeRequest < ApplicationRecord dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent has_many :cached_closes_issues, through: :merge_requests_closing_issues, source: :issue - has_many :merge_request_pipelines, foreign_key: 'merge_request_id', class_name: 'Ci::Pipeline' + has_many :pipelines_for_merge_request, foreign_key: 'merge_request_id', class_name: 'Ci::Pipeline' has_many :suggestions, through: :notes has_many :merge_request_assignees @@ -1157,10 +1157,6 @@ class MergeRequest < ApplicationRecord end end - def merge_request_pipeline_exists? - merge_request_pipelines.exists?(sha: diff_head_sha) - end - def has_test_reports? actual_head_pipeline&.has_reports?(Ci::JobArtifact.test_reports) end @@ -1379,12 +1375,12 @@ class MergeRequest < ApplicationRecord source_project.repository.squash_in_progress?(id) end - private - def find_actual_head_pipeline all_pipelines.for_sha_or_source_sha(diff_head_sha).first end + private + def source_project_variables Gitlab::Ci::Variables::Collection.new.tap do |variables| break variables unless source_project |