Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
6cd09652
Commit
6cd09652
authored
Dec 08, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support merge_request pipeline ref types
parent
1b28a2c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+3
-7
No files found.
app/models/ci/pipeline.rb
View file @
6cd09652
...
@@ -389,7 +389,7 @@ module Ci
...
@@ -389,7 +389,7 @@ module Ci
end
end
def
branch?
def
branch?
!
tag?
&&
!
merge_request?
super
&&
!
merge_request?
end
end
def
stuck?
def
stuck?
...
@@ -721,14 +721,10 @@ module Ci
...
@@ -721,14 +721,10 @@ module Ci
end
end
def
git_ref
def
git_ref
if
branch
?
if
merge_request
?
Gitlab
::
Git
::
BRANCH_REF_PREFIX
+
ref
.
to_s
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
else
raise
ArgumentError
,
'Invalid pipeline type!'
super
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment