summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pipelines/components
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-10-09 16:16:54 +0000
committerMike Greiling <mike@pixelcog.com>2018-10-09 16:16:54 +0000
commitb675b6b88d196d0185bad75e707058cafee9852b (patch)
treeee03ee63dd974574569eb792ea16c1eabfa8d356 /app/assets/javascripts/pipelines/components
parent10836664487a771319e2d97dd7b9011dcd017f14 (diff)
downloadgitlab-ce-b675b6b88d196d0185bad75e707058cafee9852b.tar.gz
Resolve "pipeline's page shows vue error on master"
Diffstat (limited to 'app/assets/javascripts/pipelines/components')
-rw-r--r--app/assets/javascripts/pipelines/components/pipelines_table.vue2
-rw-r--r--app/assets/javascripts/pipelines/components/pipelines_table_row.vue2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_table.vue
index 0d7324f3fb5..cb14d4400d1 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_table.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table.vue
@@ -35,7 +35,7 @@ export default {
},
data() {
return {
- pipelineId: '',
+ pipelineId: 0,
endpoint: '',
cancelingPipeline: null,
};
diff --git a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
index 09ee190b8ca..b03438ddba1 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_table_row.vue
@@ -47,7 +47,7 @@ export default {
required: true,
},
cancelingPipeline: {
- type: String,
+ type: Number,
required: false,
default: null,
},