Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 15 deletions

diff --git a/app/assets/javascripts/whats_new/components/app.vue b/app/assets/javascripts/whats_new/components/app.vue
index 0c55cc2f8a6..9e5361e8302 100644
--- a/app/assets/javascripts/whats_new/components/app.vue
+++ b/app/assets/javascripts/whats_new/components/app.vue
@@ -79,7 +79,7 @@ export default {
           @bottomReached="bottomReached"
         >
           <template #items>
-            <feature v-for="feature in features" :key="feature.title" :feature="feature" />
+            <feature v-for="feature in features" :key="feature.name" :feature="feature" />
           </template>
         </gl-infinite-scroll>
       </template>
diff --git a/app/assets/javascripts/whats_new/components/feature.vue b/app/assets/javascripts/whats_new/components/feature.vue
index 9380a77c1fb..c954a86e593 100644
--- a/app/assets/javascripts/whats_new/components/feature.vue
+++ b/app/assets/javascripts/whats_new/components/feature.vue
@@ -37,35 +37,35 @@ export default {
   <div class="gl-py-6 gl-px-6 gl-border-b-1 gl-border-b-solid gl-border-b-gray-100">
     <gl-link
       v-if="feature.image_url"
-      :href="feature.url"
+      :href="feature.documentation_link"
       target="_blank"
       class="gl-display-block"
       data-testid="whats-new-image-link"
       data-track-action="click_whats_new_item"
-      :data-track-label="feature.title"
-      :data-track-property="feature.url"
+      :data-track-label="feature.name"
+      :data-track-property="feature.documentation_link"
     >
       <div
         class="whats-new-item-image gl-bg-size-cover"
         :style="`background-image: url(${feature.image_url});`"
       >
-        <span class="gl-sr-only">{{ feature.title }}</span>
+        <span class="gl-sr-only">{{ feature.name }}</span>
       </div>
     </gl-link>
     <gl-link
-      :href="feature.url"
+      :href="feature.documentation_link"
       target="_blank"
       class="whats-new-item-title-link gl-display-block gl-mt-4 gl-mb-1"
       data-track-action="click_whats_new_item"
-      :data-track-label="feature.title"
-      :data-track-property="feature.url"
+      :data-track-label="feature.name"
+      :data-track-property="feature.documentation_link"
     >
-      <h5 class="gl-font-lg gl-my-0" data-test-id="feature-title">{{ feature.title }}</h5>
+      <h5 class="gl-font-lg gl-my-0" data-test-id="feature-name">{{ feature.name }}</h5>
     </gl-link>
     <div v-if="releaseDate" class="gl-mb-3" data-testid="release-date">{{ releaseDate }}</div>
-    <div v-if="feature.packages" class="gl-mb-3">
+    <div v-if="feature.available_in" class="gl-mb-3">
       <gl-badge
-        v-for="packageName in feature.packages"
+        v-for="packageName in feature.available_in"
         :key="packageName"
         size="md"
         variant="tier"
@@ -75,13 +75,16 @@ export default {
         {{ packageName }}
       </gl-badge>
     </div>
-    <div v-safe-html="feature.body" class="gl-pt-3 gl-line-height-20"></div>
+    <div
+      v-safe-html:[$options.safeHtmlConfig]="feature.description"
+      class="gl-pt-3 gl-line-height-20"
+    ></div>
     <gl-button
-      :href="feature.url"
+      :href="feature.documentation_link"
       target="_blank"
       data-track-action="click_whats_new_item"
-      :data-track-label="feature.title"
-      :data-track-property="feature.url"
+      :data-track-label="feature.name"
+      :data-track-property="feature.documentation_link"
     >
       {{ __('Learn more') }} <gl-icon name="arrow-right" />
     </gl-button>