summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/pipeline.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index abac16a138d..01d96754518 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -206,10 +206,6 @@ module Ci
triggered_by_merge_request(merge_request).for_source_sha(source_sha)
end
- scope :mergeable_merge_request_pipelines, -> (merge_request) do
- triggered_by_merge_request(merge_request).where(target_sha: merge_request.target_branch_sha)
- end
-
scope :triggered_for_branch, -> (ref) do
where(source: branch_pipeline_sources).where(ref: ref, tag: false)
end
@@ -746,10 +742,6 @@ module Ci
triggered_by_merge_request? && target_sha.present?
end
- def mergeable_merge_request_pipeline?
- triggered_by_merge_request? && target_sha == merge_request.target_branch_sha
- end
-
def merge_request_ref?
MergeRequest.merge_request_ref?(ref)
end