Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 12 deletions

diff --git a/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue b/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue
index caa85d3eaaf..1b4da047057 100644
--- a/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue
+++ b/app/assets/javascripts/vue_shared/new_namespace/components/welcome.vue
@@ -1,11 +1,7 @@
 <script>
-import SafeHtml from '~/vue_shared/directives/safe_html';
 import Tracking from '~/tracking';
 
 export default {
-  directives: {
-    SafeHtml,
-  },
   mixins: [Tracking.mixin()],
   props: {
     title: {
@@ -38,9 +34,10 @@ export default {
           @click="track('click_tab', { label: panel.name })"
         >
           <div
-            v-safe-html="panel.illustration"
-            class="new-namespace-panel-illustration gl-text-white gl-display-flex gl-flex-shrink-0 gl-justify-content-center"
-          ></div>
+            class="new-namespace-panel-illustration gl-display-flex gl-flex-shrink-0 gl-justify-content-center"
+          >
+            <img aria-hidden :src="panel.imageSrc" />
+          </div>
           <div class="gl-pl-4">
             <h3 class="gl-font-size-h2 gl-reset-color">
               {{ panel.title }}
diff --git a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue
index 5ab2e346a7a..4503ba6e561 100644
--- a/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue
+++ b/app/assets/javascripts/vue_shared/new_namespace/new_namespace_page.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlBreadcrumb, GlIcon } from '@gitlab/ui';
-import SafeHtml from '~/vue_shared/directives/safe_html';
 import NewTopLevelGroupAlert from '~/groups/components/new_top_level_group_alert.vue';
 
 import SuperSidebarToggle from '~/super_sidebar/components/super_sidebar_toggle.vue';
@@ -18,9 +17,6 @@ export default {
     LegacyContainer,
     SuperSidebarToggle,
   },
-  directives: {
-    SafeHtml,
-  },
   props: {
     title: {
       type: String,
@@ -137,7 +133,9 @@ export default {
 
     <template v-if="activePanel">
       <div class="gl-display-flex gl-align-items-center gl-py-5">
-        <div v-safe-html="activePanel.illustration" class="gl-text-white col-auto"></div>
+        <div class="col-auto">
+          <img aria-hidden :src="activePanel.imageSrc" />
+        </div>
         <div class="col">
           <h4>{{ activePanel.title }}</h4>