Commit 67942eb4 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'ee-53386-broken-master' into 'master'

EE port of Adds required prop to the post merge pipeline

See merge request gitlab-org/gitlab-ee!8162
parents a031a6f2 18530ecc
...@@ -357,6 +357,7 @@ export default { ...@@ -357,6 +357,7 @@ export default {
:has-ci="mr.hasCI" :has-ci="mr.hasCI"
:source-branch="mr.targetBranch" :source-branch="mr.targetBranch"
:source-branch-link="mr.targetBranch" :source-branch-link="mr.targetBranch"
:troubleshooting-docs-path="mr.troubleshootingDocsPath"
/> />
<deployment <deployment
v-for="postMergeDeployment in mr.postMergeDeployments" v-for="postMergeDeployment in mr.postMergeDeployments"
......
...@@ -314,6 +314,7 @@ export default { ...@@ -314,6 +314,7 @@ export default {
:has-ci="mr.hasCI" :has-ci="mr.hasCI"
:source-branch="mr.targetBranch" :source-branch="mr.targetBranch"
:source-branch-link="mr.targetBranch" :source-branch-link="mr.targetBranch"
:troubleshooting-docs-path="mr.troubleshootingDocsPath"
/> />
<deployment <deployment
v-for="postMergeDeployment in mr.postMergeDeployments" v-for="postMergeDeployment in mr.postMergeDeployments"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment