Skip to content

G
gitlab-ce
Commit e46dc315 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/assets/javascripts/pipelines/components/graph/stage_column_component.vue

parent 75c1d2b4
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 17 deletions
app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
View file @ e46dc315
...@@ -28,18 +28,8 @@ export default { ...@@ -28,18 +28,8 @@ export default {
type: String, type: String,
required: false, required: false,
default: '', default: '',
<<<<<<< HEAD
=======
},
actionDisabled: {
type: String,
required: false,
default: null,
>>>>>>> upstream/master
},
}, },
<<<<<<< HEAD
actionDisabled: { actionDisabled: {
type: String, type: String,
required: false, required: false,
...@@ -56,13 +46,6 @@ export default { ...@@ -56,13 +46,6 @@ export default {
return list[0]; return list[0];
}, },
=======
methods: {
firstJob(list) {
return list[0];
},
>>>>>>> upstream/master
jobId(job) { jobId(job) {
return `ci-badge-${job.name}`; return `ci-badge-${job.name}`;
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7