Add latest changes from gitlab-org/gitlab@master

2 files changed, 22 insertions, 10 deletions

diff --git a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue
index da54b2eb084..3dcababb4fd 100644
--- a/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue
+++ b/app/assets/javascripts/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue
@@ -176,16 +176,19 @@ export default {
         class="gl-w-full"
       >
         <template #cell(destination_name)="{ item }">
-          <gl-icon
-            v-gl-tooltip
-            :name="item.entity_type"
-            :title="getEntityTooltip(item)"
-            :aria-label="getEntityTooltip(item)"
-            class="gl-text-gray-500"
-          />
-          <gl-link :href="getFullDestinationUrl(item)" target="_blank">
-            {{ getPresentationUrl(item) }}
-          </gl-link>
+          <template v-if="item.destination_full_path">
+            <gl-icon
+              v-gl-tooltip
+              :name="item.entity_type"
+              :title="getEntityTooltip(item)"
+              :aria-label="getEntityTooltip(item)"
+              class="gl-text-gray-500"
+            />
+            <gl-link :href="getFullDestinationUrl(item)" target="_blank">
+              {{ getPresentationUrl(item) }}
+            </gl-link>
+          </template>
+          <gl-loading-icon v-else inline />
         </template>
         <template #cell(created_at)="{ value }">
           <time-ago :time="value" />
diff --git a/app/assets/javascripts/pages/projects/usage_quotas/index.js b/app/assets/javascripts/pages/projects/usage_quotas/index.js
new file mode 100644
index 00000000000..885b8ca8e12
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/usage_quotas/index.js
@@ -0,0 +1,9 @@
+import initProjectStorage from '~/usage_quotas/storage/init_project_storage';
+import initSearchSettings from '~/search_settings';
+
+const initVueApp = () => {
+  initProjectStorage('js-project-storage-count-app');
+};
+
+initVueApp();
+initSearchSettings();