summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-12-08 19:39:47 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-12-08 19:39:47 +0100
commit6cd0965233822fe31366d0763633de6bb11d8d72 (patch)
tree85c5bf25223b869874060f6fb77552a738fba6ff
parent1b28a2c1a9c9651316997f7e12b161b68001126b (diff)
downloadgitlab-ce-6cd0965233822fe31366d0763633de6bb11d8d72.tar.gz
Support merge_request pipeline ref types
-rw-r--r--app/models/ci/pipeline.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index a1a11d2f7ab..4f64fff88ac 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -389,7 +389,7 @@ module Ci
end
def branch?
- !tag? && !merge_request?
+ super && !merge_request?
end
def stuck?
@@ -721,14 +721,10 @@ module Ci
end
def git_ref
- if branch?
+ if merge_request?
Gitlab::Git::BRANCH_REF_PREFIX + ref.to_s
- elsif merge_request?
- Gitlab::Git::BRANCH_REF_PREFIX + ref.to_s
- elsif tag?
- Gitlab::Git::TAG_REF_PREFIX + ref.to_s
else
- raise ArgumentError, 'Invalid pipeline type!'
+ super
end
end