Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 3 deletions

diff --git a/app/assets/javascripts/whats_new/components/app.vue b/app/assets/javascripts/whats_new/components/app.vue
index 472bc1dfacc..a439675d467 100644
--- a/app/assets/javascripts/whats_new/components/app.vue
+++ b/app/assets/javascripts/whats_new/components/app.vue
@@ -22,7 +22,8 @@ export default {
   props: {
     versionDigest: {
       type: String,
-      required: true,
+      required: false,
+      default: undefined,
     },
   },
   computed: {
@@ -75,7 +76,7 @@ export default {
       <template #title>
         <h4 class="page-title gl-my-2">{{ __("What's new") }}</h4>
       </template>
-      <template v-if="features.length">
+      <template v-if="features.length || !fetching">
         <gl-infinite-scroll
           :fetched-items="features.length"
           :max-list-height="drawerBodyHeight"
diff --git a/app/assets/javascripts/whats_new/utils/notification.js b/app/assets/javascripts/whats_new/utils/notification.js
index f9b725ed429..1621c4d5f27 100644
--- a/app/assets/javascripts/whats_new/utils/notification.js
+++ b/app/assets/javascripts/whats_new/utils/notification.js
@@ -9,7 +9,7 @@ export const setNotification = (appEl) => {
 
   let notificationCountEl = notificationEl.querySelector('.js-whats-new-notification-count');
 
-  if (localStorage.getItem(STORAGE_KEY) === versionDigest) {
+  if (localStorage.getItem(STORAGE_KEY) === versionDigest || versionDigest === undefined) {
     notificationEl.classList.remove('with-notifications');
     if (notificationCountEl) {
       notificationCountEl.parentElement.removeChild(notificationCountEl);