Commit 75d9979a authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents a1ff52b7 c4c12f2a
...@@ -185,11 +185,6 @@ export default { ...@@ -185,11 +185,6 @@ export default {
:link="deploymentExternalUrl" :link="deploymentExternalUrl"
:css-class="`deploy-link js-deploy-url inline ${slotProps.className}`" :css-class="`deploy-link js-deploy-url inline ${slotProps.className}`"
/> />
<visual-review-app-link
v-if="showVisualReviewApp"
:link="deploymentExternalUrl"
:app-metadata="visualReviewAppMeta"
/>
</template> </template>
<template slot="result" slot-scope="slotProps"> <template slot="result" slot-scope="slotProps">
...@@ -214,13 +209,13 @@ export default { ...@@ -214,13 +209,13 @@ export default {
:link="deploymentExternalUrl" :link="deploymentExternalUrl"
css-class="js-deploy-url js-deploy-url-feature-flag deploy-link btn btn-default btn-sm inline" css-class="js-deploy-url js-deploy-url-feature-flag deploy-link btn btn-default btn-sm inline"
/> />
</template>
<visual-review-app-link <visual-review-app-link
v-if="showVisualReviewApp" v-if="showVisualReviewApp"
:link="deploymentExternalUrl" :link="deploymentExternalUrl"
:app-metadata="visualReviewAppMeta" :app-metadata="visualReviewAppMeta"
/> />
</template> </template>
</template>
<span <span
v-if="deployment.stop_url" v-if="deployment.stop_url"
v-gl-tooltip v-gl-tooltip
......
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
:class="deploymentClass" :class="deploymentClass"
:deployment="deployment" :deployment="deployment"
:show-metrics="hasDeploymentMetrics" :show-metrics="hasDeploymentMetrics"
:show-visual-review-app="true" :show-visual-review-app="showVisualReviewAppLink"
:visual-review-app-meta="visualReviewAppMeta" :visual-review-app-meta="visualReviewAppMeta"
/> />
</div> </div>
......
---
title: Move Dropdown to Stick to MR View App Button
merge_request: 29767
author:
type: fixed
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