Add latest changes from gitlab-org/gitlab@master

6 files changed, 13 insertions, 17 deletions

diff --git a/app/assets/javascripts/add_context_commits_modal/store/actions.js b/app/assets/javascripts/add_context_commits_modal/store/actions.js
index 890db374160..b2d8791ee54 100644
--- a/app/assets/javascripts/add_context_commits_modal/store/actions.js
+++ b/app/assets/javascripts/add_context_commits_modal/store/actions.js
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { uniqBy, orderBy } from 'lodash';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import Api from '~/api';
 import { createAlert } from '~/alert';
@@ -52,8 +52,8 @@ export const searchCommits = ({ dispatch, commit, state }, search = {}) => {
 };
 
 export const setCommits = ({ commit }, { commits: data, silentAddition = false }) => {
-  let commits = _.uniqBy(data, 'short_id');
-  commits = _.orderBy(data, (c) => new Date(c.committed_date), ['desc']);
+  let commits = uniqBy(data, 'short_id');
+  commits = orderBy(data, (c) => new Date(c.committed_date), ['desc']);
   if (silentAddition) {
     commit(types.SET_COMMITS_SILENT, commits);
   } else {
@@ -125,8 +125,8 @@ export const removeContextCommits = ({ state }, forceReload = false) =>
     });
 
 export const setSelectedCommits = ({ commit }, selected) => {
-  let selectedCommits = _.uniqBy(selected, 'short_id');
-  selectedCommits = _.orderBy(
+  let selectedCommits = uniqBy(selected, 'short_id');
+  selectedCommits = orderBy(
     selectedCommits,
     (selectedCommit) => new Date(selectedCommit.committed_date),
     ['desc'],
diff --git a/app/assets/javascripts/drawio/drawio_editor.js b/app/assets/javascripts/drawio/drawio_editor.js
index 37bfde0ed9f..63cc90b5db2 100644
--- a/app/assets/javascripts/drawio/drawio_editor.js
+++ b/app/assets/javascripts/drawio/drawio_editor.js
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isNil } from 'lodash';
 import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { darkModeEnabled } from '~/lib/utils/color_utils';
 import { base64DecodeUnicode } from '~/lib/utils/text_utility';
@@ -181,7 +181,7 @@ function configureDrawIOEditor(drawIOEditorState) {
 }
 
 function onDrawIOEditorMessage(drawIOEditorState, editorFacade, evt) {
-  if (_.isNil(evt) || evt.source !== drawIOEditorState.iframe.contentWindow) {
+  if (isNil(evt) || evt.source !== drawIOEditorState.iframe.contentWindow) {
     return;
   }
 
diff --git a/app/assets/javascripts/import_entities/import_projects/store/actions.js b/app/assets/javascripts/import_entities/import_projects/store/actions.js
index e5cbac71ce0..3c51fec32ae 100644
--- a/app/assets/javascripts/import_entities/import_projects/store/actions.js
+++ b/app/assets/javascripts/import_entities/import_projects/store/actions.js
@@ -1,5 +1,5 @@
 import Visibility from 'visibilityjs';
-import _ from 'lodash';
+import { isEmpty } from 'lodash';
 import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
@@ -25,7 +25,7 @@ const pathWithParams = ({ path, ...params }) => {
   return queryString ? `${path}?${queryString}` : path;
 };
 const commitPaginationData = ({ state, commit, data }) => {
-  const cursorsGitHubResponse = !_.isEmpty(data.pageInfo || {});
+  const cursorsGitHubResponse = !isEmpty(data.pageInfo || {});
 
   if (state.provider === PROVIDERS.GITHUB && cursorsGitHubResponse) {
     commit(types.SET_PAGE_CURSORS, data.pageInfo);
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index 76be0a40ca0..1290a5a17b9 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -604,11 +604,7 @@ export default class MergeRequestTabs {
     if (!isInVueNoteablePage() || this.cachedPageLayoutClasses) return;
 
     this.cachedPageLayoutClasses = this.pageLayout.className;
-    this.pageLayout.classList.remove(
-      'right-sidebar-collapsed',
-      'right-sidebar-expanded',
-      'page-with-icon-sidebar',
-    );
+    this.pageLayout.classList.remove('right-sidebar-collapsed', 'right-sidebar-expanded');
     this.sidebar.style.width = '0px';
   }
 
diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue
index 99d36a61632..251a038f7ee 100644
--- a/app/assets/javascripts/sidebar/components/participants/participants.vue
+++ b/app/assets/javascripts/sidebar/components/participants/participants.vue
@@ -110,12 +110,12 @@ export default {
     </div>
     <div
       v-if="showParticipantLabel"
-      class="title hide-collapsed gl-mb-2! gl-line-height-20 gl-font-weight-bold"
+      class="title hide-collapsed gl-line-height-20 gl-font-weight-bold gl-mb-0!"
     >
       <gl-loading-icon v-if="loading" size="sm" :inline="true" />
       {{ participantLabel }}
     </div>
-    <div class="hide-collapsed gl-display-flex gl-flex-wrap">
+    <div class="hide-collapsed gl-display-flex gl-flex-wrap gl-mt-2 gl-mb-n3">
       <div
         v-for="participant in visibleParticipants"
         :key="participant.id"
diff --git a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
index 2653748861b..ad83866ceb2 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
@@ -164,7 +164,7 @@ export default {
       </gl-button>
     </div>
     <template v-if="!initialLoading">
-      <div v-show="!edit" data-testid="collapsed-content" class="gl-line-height-14">
+      <div v-show="!edit" data-testid="collapsed-content">
         <slot name="collapsed">{{ __('None') }}</slot>
       </div>
       <div v-show="edit" data-testid="expanded-content" :class="{ 'gl-mt-3': !isClassicSidebar }">