diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:09:01 +0000 |
commit | a53d2c37c4934f564caa94543dd4cf5af1703e2d (patch) | |
tree | a028dc39771a4612a9845ab700a73af2d6f3f51b /app/assets/javascripts/vue_merge_request_widget/components | |
parent | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (diff) | |
download | gitlab-ce-a53d2c37c4934f564caa94543dd4cf5af1703e2d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue index 18d4073ecd4..e1a1b1022e3 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_view_button.vue @@ -1,4 +1,5 @@ <script> +import { GlLink } from '@gitlab/ui'; import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue'; import ReviewAppLink from '../review_app_link.vue'; @@ -6,6 +7,7 @@ export default { name: 'DeploymentViewButton', components: { FilteredSearchDropdown, + GlLink, ReviewAppLink, VisualReviewAppLink: () => import('ee_component/vue_merge_request_widget/components/visual_review_app_link.vue'), @@ -67,7 +69,7 @@ export default { </template> <template slot="result" slot-scope="slotProps"> - <a + <gl-link :href="slotProps.result.external_url" target="_blank" rel="noopener noreferrer nofollow" @@ -80,16 +82,15 @@ export default { <p class="text-secondary str-truncated-100 append-bottom-0 d-block"> {{ slotProps.result.external_url }} </p> - </a> + </gl-link> </template> </filtered-search-dropdown> - <template v-else> - <review-app-link - :display="appButtonText" - :link="deploymentExternalUrl" - css-class="js-deploy-url deploy-link btn btn-default btn-sm inline" - /> - </template> + <review-app-link + v-else + :display="appButtonText" + :link="deploymentExternalUrl" + css-class="js-deploy-url deploy-link btn btn-default btn-sm inline" + /> <visual-review-app-link v-if="showVisualReviewApp" :link="deploymentExternalUrl" |