diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-06-17 20:02:38 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-17 20:02:38 +0000 |
| commit | c4c12f2a46f3212d134ed19e693bbb811b1cefe6 (patch) | |
| tree | 162fa74a1c6a6ce1a038d9f4dc239a1bdf96eeb2 | |
| parent | d2929d6edb3a04054a5218cb1b21cb0759ec1ec8 (diff) | |
| parent | 37aa1cfecbb5519aee8fdf973e0615b0b019da58 (diff) | |
| download | gitlab-ce-c4c12f2a46f3212d134ed19e693bbb811b1cefe6.tar.gz | |
Merge branch 'visual-review-apps-fix-dropdown' into 'master'
Move Dropdown to Stick to MR View App Button
Closes gitlab-ee#12184
See merge request gitlab-org/gitlab-ce!29767
3 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue index abe5bdd2901..de0e397903e 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue @@ -184,11 +184,6 @@ export default { :link="deploymentExternalUrl" :css-class="`deploy-link js-deploy-url inline ${slotProps.className}`" /> - <visual-review-app-link - v-if="showVisualReviewApp" - :link="deploymentExternalUrl" - :app-metadata="visualReviewAppMeta" - /> </template> <template slot="result" slot-scope="slotProps"> @@ -213,12 +208,12 @@ export default { :link="deploymentExternalUrl" css-class="js-deploy-url js-deploy-url-feature-flag deploy-link btn btn-default btn-sm inline" /> - <visual-review-app-link - v-if="showVisualReviewApp" - :link="deploymentExternalUrl" - :app-metadata="visualReviewAppMeta" - /> </template> + <visual-review-app-link + v-if="showVisualReviewApp" + :link="deploymentExternalUrl" + :app-metadata="visualReviewAppMeta" + /> </template> <span v-if="deployment.stop_url" diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue index ba9a4d2a187..22a74c8cd73 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue @@ -85,7 +85,7 @@ export default { :class="deploymentClass" :deployment="deployment" :show-metrics="hasDeploymentMetrics" - :show-visual-review-app="true" + :show-visual-review-app="showVisualReviewAppLink" :visual-review-app-meta="visualReviewAppMeta" /> </div> diff --git a/changelogs/unreleased/visual-review-apps-fix-dropdown.yml b/changelogs/unreleased/visual-review-apps-fix-dropdown.yml new file mode 100644 index 00000000000..ade68c26df9 --- /dev/null +++ b/changelogs/unreleased/visual-review-apps-fix-dropdown.yml @@ -0,0 +1,5 @@ +--- +title: Move Dropdown to Stick to MR View App Button +merge_request: 29767 +author: +type: fixed |