summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-10-31 12:00:48 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-10-31 12:00:48 +0000
commit5d1c8258920e76370d1dc827c6488d35d735707a (patch)
treed2dae2ba6f8bf0b15d4a4706e1066811c3f4e9ed
parent418de3fc3601e4eafd987d716c0b677474e92d85 (diff)
downloadgitlab-ce-5d1c8258920e76370d1dc827c6488d35d735707a.tar.gz
Adds required prop to the post merge pipeline53386-broken-master
Two different MRs updating the same code were merged and this was not caught prior to merge. This MR adds the missing prop to the post merge pipeline
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index 9755d1f2443..33064f82ef7 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -356,6 +356,7 @@ export default {
:has-ci="mr.hasCI"
:source-branch="mr.targetBranch"
:source-branch-link="mr.targetBranch"
+ :troubleshooting-docs-path="mr.troubleshootingDocsPath"
/>
<deployment
v-for="postMergeDeployment in mr.postMergeDeployments"