Skip to content

Commit 55bd24e

Browse files
committed
Merge branch '52372-pipeline-s-page-shows-vue-error-on-master' into 'master'
Resolve "pipeline's page shows vue error on master" Closes #52372 See merge request gitlab-org/gitlab-ce!22201
2 parents 1083666 + b675b6b commit 55bd24e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/assets/javascripts/pipelines/components/pipelines_table.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
},
3636
data() {
3737
return {
38-
pipelineId: '',
38+
pipelineId: 0,
3939
endpoint: '',
4040
cancelingPipeline: null,
4141
};

app/assets/javascripts/pipelines/components/pipelines_table_row.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default {
4747
required: true,
4848
},
4949
cancelingPipeline: {
50-
type: String,
50+
type: Number,
5151
required: false,
5252
default: null,
5353
},

0 commit comments

Comments
 (0)