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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8587b684
Commit
8587b684
authored
Jun 06, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove conflict causing newlines.
parent
f125b097
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
...pts/pipelines/components/graph/stage_column_component.vue
+6
-0
No files found.
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
View file @
8587b684
...
@@ -8,15 +8,18 @@ export default {
...
@@ -8,15 +8,18 @@ export default {
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
jobs
:
{
jobs
:
{
type
:
Array
,
type
:
Array
,
required
:
true
,
required
:
true
,
},
},
isFirstColumn
:
{
isFirstColumn
:
{
type
:
Boolean
,
type
:
Boolean
,
required
:
false
,
required
:
false
,
default
:
false
,
default
:
false
,
},
},
stageConnectorClass
:
{
stageConnectorClass
:
{
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
...
@@ -27,14 +30,17 @@ export default {
...
@@ -27,14 +30,17 @@ export default {
required
:
true
,
required
:
true
,
},
},
},
},
components
:
{
components
:
{
jobComponent
,
jobComponent
,
dropdownJobComponent
,
dropdownJobComponent
,
},
},
methods
:
{
methods
:
{
firstJob
(
list
)
{
firstJob
(
list
)
{
return
list
[
0
];
return
list
[
0
];
},
},
jobId
(
job
)
{
jobId
(
job
)
{
return
`ci-badge-
${
job
.
name
}
`
;
return
`ci-badge-
${
job
.
name
}
`
;
},
},
...
...
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