summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-03-29 10:46:02 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-03-29 10:46:02 +0000
commit0d26c48332e7c580946adbd41795d4817909e2ef (patch)
treee42d89b8c110b65fa7553fd7b77dcbeb8a089ca9 /app/models/merge_request.rb
parent6c2e8813f0a8af1d9e7122b3dfb7491bf87483eb (diff)
parentbf639fd504c84929ff8542eef81578a6745bf428 (diff)
downloadgitlab-ce-0d26c48332e7c580946adbd41795d4817909e2ef.tar.gz
Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master'
Use merge request HEAD ref for detached merge request pipelines Closes #58454 See merge request gitlab-org/gitlab-ce!25504
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index fdfe6ca614a..b52c480a487 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1129,6 +1129,10 @@ class MergeRequest < ApplicationRecord
"refs/#{Repository::REF_MERGE_REQUEST}/#{iid}/merge"
end
+ def self.merge_request_ref?(ref)
+ ref.start_with?("refs/#{Repository::REF_MERGE_REQUEST}/")
+ end
+
def in_locked_state
begin
lock_mr