diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-09 19:16:54 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-10-09 19:16:54 +0300 |
| commit | 55bd24e4a42f5bd62e46a2a025aaafc764dd0b73 (patch) | |
| tree | ee03ee63dd974574569eb792ea16c1eabfa8d356 | |
| parent | 10836664487a771319e2d97dd7b9011dcd017f14 (diff) | |
| parent | b675b6b88d196d0185bad75e707058cafee9852b (diff) | |
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
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_table.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_table_row.vue | 2 |
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, }, |