Merge branch 'update-external-link-icon-in-merge-request-widget' into 'master'

Update external link icon in merge request widget

See merge request gitlab-org/gitlab-ce!20154

3 files changed, 15 insertions, 5 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 c44419d24e6..5e464f8a0e2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
@@ -1,4 +1,5 @@
 <script>
+import Icon from '~/vue_shared/components/icon.vue';
 import timeagoMixin from '../../vue_shared/mixins/timeago';
 import tooltip from '../../vue_shared/directives/tooltip';
 import LoadingButton from '../../vue_shared/components/loading_button.vue';
@@ -14,6 +15,7 @@ export default {
     LoadingButton,
     MemoryUsage,
     StatusIcon,
+    Icon,
   },
   directives: {
     tooltip,
@@ -110,11 +112,10 @@ export default {
               class="deploy-link js-deploy-url"
             >
               {{ deployment.external_url_formatted }}
-              <i
-                class="fa fa-external-link"
-                aria-hidden="true"
-              >
-              </i>
+              <icon
+                :size="16"
+                name="external-link"
+              />
             </a>
           </template>
           <span
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index ccf5d632614..efd730af558 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -737,6 +737,10 @@
   > *:not(:last-child) {
     margin-right: .3em;
   }
+
+  svg {
+    vertical-align: text-top;
+  }
 }
 
 .deploy-link {
diff --git a/changelogs/unreleased/update-external-link-icon-in-merge-request-widget.yml b/changelogs/unreleased/update-external-link-icon-in-merge-request-widget.yml
new file mode 100644
index 00000000000..c650c32f884
--- /dev/null
+++ b/changelogs/unreleased/update-external-link-icon-in-merge-request-widget.yml
@@ -0,0 +1,5 @@
+---
+title: Update external link icon in merge request widget
+merge_request: 20154
+author: George Tsiolis
+type: changed