diff options
| author | Phil Hughes <me@iamphill.com> | 2018-10-31 13:17:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-10-31 13:17:27 +0000 |
| commit | 116117084c22881924735e4b07509c49d19b48c7 (patch) | |
| tree | 6a2c97cf377d5ea21483ed0a23e50b202f02ec95 | |
| parent | e62168fcae0089d84ff00c799f98915de5ec1145 (diff) | |
| parent | 5d1c8258920e76370d1dc827c6488d35d735707a (diff) | |
| download | gitlab-ce-116117084c22881924735e4b07509c49d19b48c7.tar.gz | |
Merge branch '53386-broken-master' into 'master'
Adds required prop to the post merge pipeline
Closes #53386
See merge request gitlab-org/gitlab-ce!22715
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 1 |
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" |