diff options
| author | Andrew Fontaine <afontaine@gitlab.com> | 2019-06-17 12:55:51 -0400 |
|---|---|---|
| committer | Andrew Fontaine <afontaine@gitlab.com> | 2019-06-17 12:55:51 -0400 |
| commit | 0be1c827e3ee150c7d211487f1ada620b8a60606 (patch) | |
| tree | f853e437f7fb6d0518185c76e58a8782c7622933 | |
| parent | 08ed6b1720ff4d6e2b45a97000a106071d650194 (diff) | |
| download | gitlab-ce-visual-review-apps-fix-dropdown.tar.gz | |
Move Dropdown to Stick to MR View App Buttonvisual-review-apps-fix-dropdown
The dropdown of changed pages in the review app should be attached to
the view app button. This moves it to the correct place. The Review App
button is to the right of both of those.
closes gitlab-org/gitlab-ee#12184
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment.vue | 32 |
1 files changed, 16 insertions, 16 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..0b6e4732012 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"> @@ -208,17 +203,22 @@ export default { </a> </template> </filtered-search-dropdown> - <template v-else> - <review-app-link - :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> + <template v-else> + <review-app-link + :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> <span v-if="deployment.stop_url" |