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, 7 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 9b5b46f4928..a4741027121 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -27,7 +27,7 @@ module Ci
end
def project_id
- project.id
+ gl_project_id
end
def valid_commit_sha
@@ -161,6 +161,12 @@ module Ci
git_commit_message =~ /(\[ci skip\])/ if git_commit_message
end
+ def merge_request
+ MergeRequest.includes(:merge_request_diff)
+ .where(source_branch: ref, source_project_id: gl_project_id)
+ .reorder(iid: :asc).last
+ end
+
private
def update_state