Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

Gemfile

@@ -472,7 +472,7 @@ end
 gem 'spamcheck', '~> 0.1.0'
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 14.1.0.pre.rc3'
+gem 'gitaly', '~> 14.1.0.pre.rc4'
 
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'

Gemfile.lock

@@ -460,7 +460,7 @@ GEM
       rails (>= 3.2.0)
     git (1.7.0)
       rchardet (~> 1.8)
-    gitaly (14.1.0.pre.rc3)
+    gitaly (14.1.0.pre.rc4)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab (4.16.1)
@@ -531,8 +531,8 @@ GEM
       signet (~> 0.12)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-protobuf (3.17.1)
-    googleapis-common-protos-types (1.0.6)
+    google-protobuf (3.17.3)
+    googleapis-common-protos-types (1.1.0)
       google-protobuf (~> 3.14)
     googleauth (0.14.0)
       faraday (>= 0.17.3, < 2.0)
@@ -1482,7 +1482,7 @@ DEPENDENCIES
   gettext (~> 3.3)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 14.1.0.pre.rc3)
+  gitaly (~> 14.1.0.pre.rc4)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 2.2.2)

app/assets/javascripts/commons/vue.js

@@ -1,10 +1,12 @@
 import Vue from 'vue';
 import GlFeatureFlagsPlugin from '~/vue_shared/gl_feature_flags_plugin';
+import Translate from '~/vue_shared/translate';
 
 if (process.env.NODE_ENV !== 'production') {
   Vue.config.productionTip = false;
 }
 
 Vue.use(GlFeatureFlagsPlugin);
+Vue.use(Translate);
 
 Vue.config.ignoredElements = ['gl-emoji'];

app/assets/javascripts/frequent_items/index.js

@@ -59,9 +59,6 @@ export default {
           shouldShowInProgressAlert: isInProgress(project.jiraImportStatus),
         };
       },
-      skip() {
-        return !this.isJiraConfigured || !this.canEdit;
-      },
     },
   },
   computed: {
@@ -75,6 +72,9 @@ export default {
     labelTarget() {
       return `${this.issuesPath}?label_name[]=${encodeURIComponent(this.jiraImport.label.title)}`;
     },
+    shouldRender() {
+      return this.jiraImport.shouldShowInProgressAlert || this.jiraImport.shouldShowFinishedAlert;
+    },
   },
   methods: {
     hideFinishedAlert() {
@@ -89,7 +89,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-my-5">
+  <div v-if="shouldRender" class="gl-my-5">
     <gl-alert v-if="jiraImport.shouldShowInProgressAlert" @dismiss="hideInProgressAlert">
       {{ __('Import in progress. Refresh page to see newly added issues.') }}
     </gl-alert>

app/assets/javascripts/issues_list/components/jira_issues_import_status_app.vue

@@ -13,6 +13,14 @@ export function mountJiraIssuesListApp() {
     return false;
   }
 
+  const { issuesPath, projectPath } = el.dataset;
+  const canEdit = parseBoolean(el.dataset.canEdit);
+  const isJiraConfigured = parseBoolean(el.dataset.isJiraConfigured);
+
+  if (!isJiraConfigured || !canEdit) {
+    return false;
+  }
+
   Vue.use(VueApollo);
 
   const defaultClient = createDefaultClient();
@@ -26,10 +34,10 @@ export function mountJiraIssuesListApp() {
     render(createComponent) {
       return createComponent(JiraIssuesImportStatusRoot, {
         props: {
-          canEdit: parseBoolean(el.dataset.canEdit),
-          isJiraConfigured: parseBoolean(el.dataset.isJiraConfigured),
-          issuesPath: el.dataset.issuesPath,
-          projectPath: el.dataset.projectPath,
+          canEdit,
+          isJiraConfigured,
+          issuesPath,
+          projectPath,
         },
       });
     },

app/assets/javascripts/issues_list/index.js

@@ -27,7 +27,6 @@ import { getLocationHash, visitUrl } from './lib/utils/url_utility';
 import initFeatureHighlight from './feature_highlight';
 import LazyLoader from './lazy_loader';
 import initLogoAnimation from './logo';
-import initFrequentItemDropdowns from './frequent_items';
 import initBreadcrumbs from './breadcrumb';
 import initPersistentUserCallouts from './persistent_user_callouts';
 import { initUserTracking, initDefaultTrackers } from './tracking';
@@ -92,7 +91,6 @@ function deferredInitialisation() {
   initServicePingConsent();
   initUserPopovers();
   initBroadcastNotifications();
-  initFrequentItemDropdowns();
   initPersistentUserCallouts();
   initDefaultTrackers();
   initFeatureHighlight();

app/assets/javascripts/main.js

@@ -1,4 +1,7 @@
-// With combined_menu feature flag, there's a benefit to splitting up the import
+// TODO: With the combined_menu feature flag removed, there's likely a better
+// way to slice up the async import (i.e., include trigger in main bundle, but
+// async import subviews. Don't do this at the cost of UX).
+// See https://gitlab.com/gitlab-org/gitlab/-/issues/336042
 const importModule = () => import(/* webpackChunkName: 'top_nav' */ './mount');
 
 const tryMountTopNav = async () => {

app/assets/javascripts/nav/index.js

@@ -50,12 +50,6 @@
       width: 100%;
     }
 
-    &.frequent-items-dropdown-menu {
-      padding: 0;
-      overflow-y: initial;
-      max-height: initial;
-    }
-
     // `GlDropdown` specifies the `max-height` of `.gl-new-dropdown-inner`
     // as `$dropdown-max-height`, but the `max-height` rule above forces
     // the parent `.dropdown-menu` to be _slightly_ too small because of
@@ -834,61 +828,11 @@
   }
 }
 
-header.header-content .dropdown-menu.frequent-items-dropdown-menu {
-  padding: 0;
-}
-
 .frequent-items-dropdown-container {
   display: flex;
   flex-direction: row;
   height: $grid-size * 40;
 
-  &.with-deprecated-styles {
-    width: 500px;
-    height: 354px;
-
-    .section-header,
-    .frequent-items-list-container li.section-empty {
-      padding: 0 $gl-padding;
-    }
-
-    .search-input-container {
-      position: relative;
-      padding: 4px $gl-padding;
-
-      .search-icon {
-        position: absolute;
-        top: 13px;
-        right: 25px;
-        color: $gray-300;
-      }
-    }
-
-    @include media-breakpoint-down(xs) {
-      flex-direction: column;
-      width: 100%;
-      height: auto;
-      flex: 1;
-
-      .frequent-items-dropdown-sidebar,
-      .frequent-items-dropdown-content {
-        width: 100%;
-      }
-
-      .frequent-items-dropdown-sidebar {
-        border-bottom: 1px solid $border-color;
-        border-right: 0;
-      }
-    }
-
-    .frequent-items-list-container {
-      width: auto;
-      height: auto;
-      padding-bottom: 0;
-    }
-  }
-
-  .frequent-items-dropdown-sidebar,
   .frequent-items-dropdown-content {
     @include gl-pt-3;
   }
@@ -897,11 +841,6 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
     color: $almost-black;
   }
 
-  .frequent-items-dropdown-sidebar {
-    width: 30%;
-    border-right: 1px solid $border-color;
-  }
-
   .frequent-items-dropdown-content {
     position: relative;
     width: 70%;

app/assets/stylesheets/framework/dropdowns.scss

@@ -336,9 +336,6 @@ h1 {
 .d-none {
   display: none !important;
 }
-.d-inline-block {
-  display: inline-block !important;
-}
 .d-block {
   display: block !important;
 }
@@ -363,11 +360,6 @@ h1 {
     display: block !important;
   }
 }
-@media (min-width: 1200px) {
-  .d-xl-block {
-    display: block !important;
-  }
-}
 .sr-only {
   position: absolute;
   width: 1px;
@@ -1407,10 +1399,6 @@ svg.s16 {
   width: 16px;
   height: 16px;
 }
-svg.s18 {
-  width: 18px;
-  height: 18px;
-}
 svg.s32 {
   width: 32px;
   height: 32px;
@@ -1499,12 +1487,6 @@ svg.s16 {
   height: 16px;
   margin-right: 8px;
 }
-.avatar.s18,
-.avatar-container.s18 {
-  width: 18px;
-  height: 18px;
-  margin-right: 8px;
-}
 .avatar.s32,
 .avatar-container.s32 {
   width: 32px;
@@ -1583,9 +1565,6 @@ svg.s16 {
 .rect-avatar.s16 {
   border-radius: 2px;
 }
-.rect-avatar.s18 {
-  border-radius: 2px;
-}
 .rect-avatar.s32,
 .nav-sidebar-inner-scroll
   > div.context-header