Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/rules.gitlab-ci.yml

@@ -76,6 +76,9 @@
 .if-merge-request-labels-run-all-jest: &if-merge-request-labels-run-all-jest
   if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-jest/'
 
+.if-merge-request-labels-run-all-e2e: &if-merge-request-labels-run-all-e2e
+  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-e2e/'
+
 .if-merge-request-labels-run-single-db: &if-merge-request-labels-run-single-db
   if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-single-db/'
 
@@ -297,6 +300,9 @@
   - "vendor/assets/**/*"
   - "{app/assets,app/components,app/helpers,app/presenters,app/views,locale,public,spec/frontend,storybook,symbol}/**/*"
 
+.initializers-patterns: &initializers-patterns
+  - "{,ee/,jh/}config/initializers/**/*"
+
 .controllers-patterns: &controllers-patterns
   - "{,ee/,jh/}{app/controllers}/**/*"
 
@@ -1141,13 +1147,18 @@
       allow_failure: true
     - <<: *if-ruby2-branch
       allow_failure: true
+    - <<: *if-merge-request-labels-run-all-e2e
+      allow_failure: true
     - <<: *if-dot-com-gitlab-org-and-security-merge-request-manual-ff-package-and-e2e
       changes: *feature-flag-development-config-patterns
       when: manual
       allow_failure: true
     - <<: *if-dot-com-gitlab-org-and-security-merge-request
       changes: *feature-flag-development-config-patterns
       allow_failure: true
+    - <<: *if-dot-com-gitlab-org-and-security-merge-request
+      changes: *initializers-patterns
+      allow_failure: true
     - <<: *if-dot-com-gitlab-org-and-security-merge-request
       changes: *nodejs-patterns
       allow_failure: true

GITALY_SERVER_VERSION

@@ -1 +1 @@
-b1841c6d79f62066335ad4d44efa21f3c5f77c03
+ddcce8f5e7878c997a9863f5c3ed532d7126256b

Gemfile

@@ -39,7 +39,7 @@ gem 'default_value_for', '~> 3.4.0'
 # Supported DBs
 gem 'pg', '~> 1.4.5'
 
-gem 'rugged', '~> 1.2'
+gem 'rugged', '~> 1.5'
 gem 'grape-path-helpers', '~> 1.7.1'
 
 gem 'faraday', '~> 1.0'

Gemfile.checksum

@@ -519,7 +519,7 @@
 {"name":"rubyntlm","version":"0.6.3","platform":"ruby","checksum":"5b321456dba3130351f7451f8669f1afa83a0d26fd63cdec285b7b88e667102d"},
 {"name":"rubypants","version":"0.2.0","platform":"ruby","checksum":"f07e38eac793655a0323fe91946081052341b9e69807026fcf102346589eedee"},
 {"name":"rubyzip","version":"2.3.2","platform":"ruby","checksum":"3f57e3935dc2255c414484fbf8d673b4909d8a6a57007ed754dde39342d2373f"},
-{"name":"rugged","version":"1.2.0","platform":"ruby","checksum":"111979962e75378209673ae262a8f43bd1971b5b5f96f4dfb77ca82b343604ed"},
+{"name":"rugged","version":"1.5.1","platform":"ruby","checksum":"a83493d050652d9e65eb6844a32f2c3da59e385e875214f7e502db547a7fce72"},
 {"name":"safe_yaml","version":"1.0.4","platform":"ruby","checksum":"248193992ef1730a0c9ec579999ef2256a2b3a32a9bd9d708a1e12544a489ec2"},
 {"name":"safety_net_attestation","version":"0.4.0","platform":"ruby","checksum":"96be2d74e7ed26453a51894913449bea0e072f44490021545ac2d1c38b0718ce"},
 {"name":"sanitize","version":"6.0.0","platform":"ruby","checksum":"81795f985873f3bacee2eaaededeaafc3a29aafeaa9aff51e04b85a66bbf08ff"},
@@ -618,7 +618,7 @@
 {"name":"tzinfo","version":"2.0.5","platform":"ruby","checksum":"c5352fd901544d396745d013f46a04ae2ed081ce806d942099825b7c2b09a167"},
 {"name":"u2f","version":"0.2.1","platform":"ruby","checksum":"7907b163c00682ce94d82178154af2ec3930e50f342c3502d64929c6370c5553"},
 {"name":"uber","version":"0.1.0","platform":"ruby","checksum":"5beeb407ff807b5db994f82fa9ee07cfceaa561dad8af20be880bc67eba935dc"},
-{"name":"undercover","version":"0.4.4","platform":"ruby","checksum":"61c4cbe03a9de0764b07cceef82a63f9d8dbf4d8680ec017cee307927561f6a5"},
+{"name":"undercover","version":"0.4.5","platform":"ruby","checksum":"27bb5d708e253e2c1a3f3edd3668a30728f0e59a1e18004b623d5e7b1e86f3b9"},
 {"name":"unf","version":"0.1.4","platform":"java","checksum":"49a5972ec0b3d091d3b0b2e00113f2f342b9b212f0db855eb30a629637f6d302"},
 {"name":"unf","version":"0.1.4","platform":"ruby","checksum":"4999517a531f2a955750f8831941891f6158498ec9b6cb1c81ce89388e63022e"},
 {"name":"unf_ext","version":"0.0.8.2","platform":"ruby","checksum":"90b9623ee359cc4878461c5d2eab7d3d3ce5801a680a9e7ac83b8040c5b742fa"},

Gemfile.lock

@@ -1304,7 +1304,7 @@ GEM
     rubyntlm (0.6.3)
     rubypants (0.2.0)
     rubyzip (2.3.2)
-    rugged (1.2.0)
+    rugged (1.5.1)
     safe_yaml (1.0.4)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
@@ -1501,10 +1501,10 @@ GEM
       concurrent-ruby (~> 1.0)
     u2f (0.2.1)
     uber (0.1.0)
-    undercover (0.4.4)
+    undercover (0.4.5)
       imagen (>= 0.1.8)
       rainbow (>= 2.1, < 4.0)
-      rugged (>= 0.27, < 1.3)
+      rugged (>= 0.27, < 1.6)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
@@ -1820,7 +1820,7 @@ DEPENDENCIES
   ruby-saml (~> 1.13.0)
   ruby_parser (~> 3.19)
   rubyzip (~> 2.3.2)
-  rugged (~> 1.2)
+  rugged (~> 1.5)
   sanitize (~> 6.0)
   sassc-rails (~> 2.1.0)
   sd_notify (~> 0.1.0)

app/assets/javascripts/api/projects_api.js

@@ -19,6 +19,10 @@ export function getProjects(query, options, callback = () => {}) {
     defaults.membership = true;
   }
 
+  if (gon.features.fullPathProjectSearch && query?.includes('/')) {
+    defaults.search_namespaces = true;
+  }
+
   return axios
     .get(url, {
       params: Object.assign(defaults, options),

app/assets/javascripts/graphql_shared/issuable_client.js

@@ -74,6 +74,7 @@ export const config = {
                     },
                   };
                 }
+
                 return incomingWidget || existingWidget;
               });
             },

app/assets/javascripts/header_search/constants.js

@@ -77,3 +77,5 @@ export const DROPDOWN_ORDER = [
 ];
 
 export const FETCH_TYPES = ['generic', 'search'];
+
+export const SEARCH_INPUT_FIELD_MAX_WIDTH = '640px';

app/assets/javascripts/header_search/index.js

@@ -1,36 +1,44 @@
 import Vue from 'vue';
+import * as Sentry from '@sentry/browser';
 import Translate from '~/vue_shared/translate';
 import HeaderSearchApp from './components/app.vue';
 import createStore from './store';
+import { SEARCH_INPUT_FIELD_MAX_WIDTH } from './constants';
 
 Vue.use(Translate);
 
 export const initHeaderSearchApp = (search = '') => {
   const el = document.getElementById('js-header-search');
-  let navBarEl = null;
+  const headerEl = document.querySelector('.header-content');
 
-  if (!el) {
+  if (!el && !headerEl) {
     return false;
   }
 
+  const searchContainer = headerEl.querySelector('.global-search-container');
+  const newHeader = headerEl.querySelector('.header-search-new');
+
   const { searchPath, issuesPath, mrPath, autocompletePath } = el.dataset;
   let { searchContext } = el.dataset;
-  searchContext = JSON.parse(searchContext);
+
+  try {
+    searchContext = JSON.parse(searchContext);
+    newHeader.style.maxWidth = SEARCH_INPUT_FIELD_MAX_WIDTH;
+  } catch (error) {
+    Sentry.captureException(error);
+  }
 
   return new Vue({
     el,
     store: createStore({ searchPath, issuesPath, mrPath, autocompletePath, searchContext, search }),
-    mounted() {
-      navBarEl = document.querySelector('.header-content');
-    },
     render(createElement) {
       return createElement(HeaderSearchApp, {
         on: {
           expandSearchBar: () => {
-            navBarEl?.classList.add('header-search-is-active');
+            searchContainer.style.flexGrow = '1';
           },
           collapseSearchBar: () => {
-            navBarEl?.classList.remove('header-search-is-active');
+            searchContainer.style.flexGrow = '0';
           },
         },
       });

app/assets/javascripts/jira_connect/subscriptions/constants.js

@@ -38,7 +38,7 @@ export const INTEGRATIONS_DOC_LINK = helpPagePath('integration/jira/development_
   anchor: 'use-the-integration',
 });
 export const OAUTH_SELF_MANAGED_DOC_LINK = helpPagePath('integration/jira/connect-app', {
-  anchor: 'connect-the-gitlabcom-for-jira-cloud-app-for-self-managed-instances',
+  anchor: 'connect-the-gitlab-for-jira-cloud-app-for-self-managed-instances',
 });
 
 export const GITLAB_COM_BASE_PATH = 'https://gitlab.com';

app/assets/javascripts/lib/utils/text_markdown.js

@@ -522,15 +522,23 @@ function handleContinueList(e, textArea) {
   if (!(e.key === 'Enter')) return;
   if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) return;
   if (textArea.selectionStart !== textArea.selectionEnd) return;
+
   // prevent unintended line breaks inserted using Japanese IME on MacOS
   if (compositioningNoteText) return;
 
-  const firstSelectedLine = linesFromSelection(textArea).lines[0];
+  const selectedLines = linesFromSelection(textArea);
+  const firstSelectedLine = selectedLines.lines[0];
   const listLineMatch = firstSelectedLine.match(LIST_LINE_HEAD_PATTERN);
 
   if (listLineMatch) {
     const { leader, indent, content, isOl } = listLineMatch.groups;
     const emptyListItem = !content;
+    const prefixLength = leader.length + indent.length;
+
+    if (selectedLines.selectionStart - selectedLines.startPos < prefixLength) {
+      // cursor in the indent/leader area,  allow the natural line feed to be added
+      return;
+    }
 
     if (emptyListItem) {
       // erase empty list item - select the text and allow the

app/assets/javascripts/pages/admin/hooks/index.js

@@ -0,0 +1,3 @@
+import { initHookTestDropdowns } from '~/webhooks';
+
+initHookTestDropdowns();

app/assets/javascripts/pages/projects/hooks/index.js

@@ -1,7 +1,8 @@
 import initSearchSettings from '~/search_settings';
-import initWebhookForm from '~/webhooks';
+import initWebhookForm, { initHookTestDropdowns } from '~/webhooks';
 import { initPushEventsEditForm } from '~/webhooks/webhook';
 
 initSearchSettings();
 initWebhookForm();
 initPushEventsEditForm();
+initHookTestDropdowns();

app/assets/javascripts/tracking/get_standard_context.js

@@ -10,7 +10,7 @@ export default function getStandardContext({ extra = {} } = {}) {
       ...data,
       source: SNOWPLOW_JS_SOURCE,
       google_analytics_id: getCookie(GOOGLE_ANALYTICS_ID_COOKIE_NAME) ?? '',
-      extra: extra || data.extra,
+      extra: { ...data.extra, ...extra },
     },
   };
 }

app/assets/javascripts/vue_shared/components/header_ci_component.vue

@@ -4,7 +4,7 @@ import SafeHtml from '~/vue_shared/directives/safe_html';
 import { isGid, getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { glEmojiTag } from '~/emoji';
 import { __, sprintf } from '~/locale';
-import CiIconBadge from './ci_badge_link.vue';
+import CiBadgeLink from './ci_badge_link.vue';
 import TimeagoTooltip from './time_ago_tooltip.vue';
 
 /**
@@ -16,7 +16,7 @@ import TimeagoTooltip from './time_ago_tooltip.vue';
  */
 export default {
   components: {
-    CiIconBadge,
+    CiBadgeLink,
     TimeagoTooltip,
     GlButton,
     GlAvatarLink,
@@ -120,7 +120,7 @@ export default {
     data-testid="ci-header-content"
   >
     <section class="header-main-content gl-mr-3">
-      <ci-icon-badge :status="status" />
+      <ci-badge-link :status="status" />
 
       <strong data-testid="ci-header-item-text">{{ item }}</strong>
 

app/assets/javascripts/webhooks/components/test_dropdown.vue

@@ -0,0 +1,69 @@
+<script>
+import { GlDisclosureDropdown } from '@gitlab/ui';
+import { __ } from '~/locale';
+
+export default {
+  name: 'HookTestDropdown',
+  components: {
+    GlDisclosureDropdown,
+  },
+  props: {
+    items: {
+      type: Array,
+      required: true,
+    },
+    size: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
+  },
+  computed: {
+    itemsWithAction() {
+      return this.items.map((item) => ({
+        text: item.text,
+        action: () => this.testHook(item.href),
+      }));
+    },
+  },
+  methods: {
+    testHook(href) {
+      // HACK: Trigger @rails/ujs's data-method handling.
+      //
+      // The more obvious approaches of (1) declaratively rendering the
+      // links using GlDisclosureDropdown's list-item slot and (2) using
+      // item.extraAttrs to set the data-method attributes on the links
+      // do not work for reasons laid out in
+      // https://gitlab.com/gitlab-org/gitlab-ui/-/issues/2134.
+      //
+      // Sending the POST with axios also doesn't work, since the
+      // endpoints return 302 redirects. Since axios uses XMLHTTPRequest,
+      // it transparently follows redirects, meaning the Location header
+      // of the first response cannot be inspected/acted upon by JS. We
+      // could manually trigger a reload afterwards, but that would mean
+      // a duplicate fetch of the current page: one by the XHR, and one
+      // by the explicit reload. It would also mean losing the flash
+      // alert set by the backend, making the feature useless for the
+      // user.
+      //
+      // The ideal fix here would be to refactor the test endpoint to
+      // return a JSON response, removing the need for a redirect/page
+      // reload to show the result.
+      const a = document.createElement('a');
+      a.setAttribute('hidden', '');
+      a.href = href;
+      a.dataset.method = 'post';
+      document.body.appendChild(a);
+      a.click();
+      a.remove();
+    },
+  },
+  i18n: {
+    test: __('Test'),
+  },
+};
+</script>
+
+<template>
+  <gl-disclosure-dropdown :toggle-text="$options.i18n.test" :items="itemsWithAction" :size="size" />
+</template>

app/assets/javascripts/webhooks/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import FormUrlApp from './components/form_url_app.vue';
+import TestDropdown from './components/test_dropdown.vue';
 
 export default () => {
   const el = document.querySelector('.js-vue-webhook-form');
@@ -23,3 +24,22 @@ export default () => {
     },
   });
 };
+
+const initHookTestDropdown = (el) => {
+  const { items, size } = el.dataset;
+
+  return new Vue({
+    el,
+    render(h) {
+      return h(TestDropdown, {
+        props: {
+          items: JSON.parse(items),
+          size,
+        },
+      });
+    },
+  });
+};
+
+export const initHookTestDropdowns = (selector = '.js-webhook-test-dropdown') =>
+  document.querySelectorAll(selector).forEach(initHookTestDropdown);

app/assets/javascripts/work_items/components/work_item_detail_modal.vue

@@ -156,6 +156,7 @@ export default {
     modal-id="work-item-detail-modal"
     header-class="gl-p-0 gl-pb-2!"
     scrollable
+    data-testid="work-item-detail-modal"
     @hide="closeModal"
   >
     <gl-alert v-if="error" variant="danger" @dismiss="error = false">

app/assets/javascripts/work_items/graphql/work_item_metadata_widgets.fragment.graphql

@@ -3,6 +3,15 @@
 #import "~/work_items/graphql/milestone.fragment.graphql"
 
 fragment WorkItemMetadataWidgets on WorkItemWidget {
+  ... on WorkItemWidgetDescription {
+    type
+  }
+  ... on WorkItemWidgetStartAndDueDate {
+    type
+  }
+  ... on WorkItemWidgetNotes {
+    type
+  }
   ... on WorkItemWidgetMilestone {
     type
     milestone {
@@ -11,6 +20,8 @@ fragment WorkItemMetadataWidgets on WorkItemWidget {
   }
   ... on WorkItemWidgetAssignees {
     type
+    allowsMultipleAssignees
+    canInviteMembers
     assignees {
       nodes {
         ...User