Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/gitlab/documentation_links/link.yml

@@ -17,7 +17,6 @@ Gitlab/DocumentationLinks/Link:
     - 'app/presenters/key_presenter.rb'
     - 'app/serializers/merge_request_widget_entity.rb'
     - 'ee/app/components/namespaces/combined_storage_users/base_alert_component.rb'
-    - 'ee/app/helpers/billing_plans_helper.rb'
     - 'ee/app/helpers/ee/groups/settings_helper.rb'
     - 'ee/app/helpers/ee/import_helper.rb'
     - 'ee/app/helpers/projects/learn_gitlab_helper.rb'

app/assets/javascripts/ide/init_gitlab_web_ide.js

@@ -79,7 +79,6 @@ export const initGitlabWebIDE = async (el) => {
         signIn: el.dataset.signInPath,
       },
       featureFlags: {
-        settingsSync: true,
         crossOriginExtensionHost: getCrossOriginExtensionHostFlagValue(extensionsGallerySettings),
       },
       editorFont,

app/assets/javascripts/users_select/constants.js

@@ -8,4 +8,4 @@ export const AJAX_USERS_SELECT_PARAMS_MAP = {
   states: 'states',
 };
 
-export const ACTIVE_AND_BLOCKED_USER_STATES = ['active', 'blocked'];
+export const ACTIVE_AND_BLOCKED_USER_STATES = ['active', 'blocked', 'ldap_blocked'];

app/graphql/resolvers/merge_requests_resolver.rb

@@ -183,6 +183,13 @@ def self.accept_reviewer
                 Array of source branch names.
                 No resolved merge requests will have one of these branches as their source.
         DESC
+      argument :target_branches, [GraphQL::Types::String],
+        required: false,
+        as: :target_branch,
+        description: <<~DESC
+                Array of target branch names.
+                No resolved merge requests will have one of these branches as their target.
+        DESC
     end
 
     validates mutually_exclusive: [:assignee_username, :assignee_wildcard_id]

config/webpack.config.js

@@ -744,6 +744,15 @@ module.exports = {
           'app/assets/javascripts/vue_shared/components/empty_component.js',
         );
       }),
+    !IS_EE &&
+      !IS_JH &&
+      new webpack.NormalModuleReplacementPlugin(/^jh_else_ee\/(.*)\.vue/, (resource) => {
+        // eslint-disable-next-line no-param-reassign
+        resource.request = path.join(
+          ROOT_PATH,
+          'app/assets/javascripts/vue_shared/components/empty_component.js',
+        );
+      }),
 
     new CopyWebpackPlugin({
       patterns: copyFilesPatterns,

doc/administration/logs/tracing_correlation_id.md

@@ -198,9 +198,9 @@ You can then view the database details for this request:
    <!-- vale gitlab_base.Substitutions = NO -->
 1. Select the `pg` link in the Progress Bar to view the database queries executed by the API request:
 
-   ![View pg database details](img/view-pg-details_v14_3.png)
+   ![GitLab API database details: 29ms / 34 queries](img/view-pg-details_v14_3.png)
    <!-- vale gitlab_base.Substitutions = YES -->
 
    The database query dialog is displayed:
 
-   ![Database query dialog](img/database-query-dialog_v14_3.png)
+   ![Database query dialog with 34 SQL queries, 29ms duration, 34 replicas, 4 cached, and sorting options](img/database-query-dialog_v14_3.png)

doc/api/graphql/reference/index.md

@@ -43020,6 +43020,7 @@ Defines which user roles, users, or groups can merge into a protected branch.
 | <a id="mergerequestsresolvernegatedparamsreleasetag"></a>`releaseTag` | [`String`](#string) | Filter by release tag to exclude. |
 | <a id="mergerequestsresolvernegatedparamsreviewerusername"></a>`reviewerUsername` | [`String`](#string) | Username of the reviewer to exclude. |
 | <a id="mergerequestsresolvernegatedparamssourcebranches"></a>`sourceBranches` | [`[String!]`](#string) | Array of source branch names. No resolved merge requests will have one of these branches as their source. |
+| <a id="mergerequestsresolvernegatedparamstargetbranches"></a>`targetBranches` | [`[String!]`](#string) | Array of target branch names. No resolved merge requests will have one of these branches as their target. |
 
 ### `MonthSelectionInput`
 

doc/ci/steps/index.md

@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 DETAILS:
 **Tier:** Free, Premium, Ultimate
 **Offering:** GitLab.com, Self-managed, GitLab Dedicated
-**Status:** Experimental
+**Status:** Experiment
 
 Steps are reusable units of a job that when composed together replace the `script` used in a GitLab CI/CD job.
 While you are not required to use steps, the reusability, composability, testability, and independence
@@ -18,8 +18,9 @@ of steps make it easier to understand and maintain CI/CD pipeline.
 To get started, you can try the [Set up steps tutorial](../../tutorials/setup_steps/index.md).
 To start creating your own steps, see [Creating your own step](#create-your-own-step).
 
-Follow the team's progress building steps at the epic, [CI Steps: Composability in GitLab CI/CD](https://gitlab.com/groups/gitlab-org/-/epics/11535).
-To report a bug, create an issue in the [step-runner](https://gitlab.com/gitlab-org/step-runner/-/issues) project.
+This experimental feature is still in active development and might have breaking
+changes at any time. Review the [changelog](https://gitlab.com/gitlab-org/step-runner/-/blob/main/CHANGELOG.md)
+for full details on any breaking changes.
 
 CI/CD steps are different than [CI/CD components](../components/index.md). Components
 are reusable single pipeline configuration units. They are included in a pipeline when it is created,
@@ -299,7 +300,7 @@ Input names can only use alpha-numeric characters and underscores, and must not
 Inputs must have a type, and they can optionally specify a default value. An input with no default value
 is a required input, it must be specified when using the step.
 
-Inputs must be one of the following types. The default input type is `string`.
+Inputs must be one of the following types.
 
 | Type      | Example                 | Description |
 |:----------|:------------------------|:------------|
@@ -336,14 +337,13 @@ Similar to inputs, output names can only use alpha-numeric characters and unders
 and must not start with a number. Outputs must have a type, and they can optionally specify a default value.
 The default value is returned when the step doesn't return the output.
 
-Outputs must be one of the following types. The default input type is `raw_string`.
+Outputs must be one of the following types.
 
 | Type         | Example                 | Description |
 |:-------------|:------------------------|:------------|
 | `array`      | `["a","b"]`             | A list of un-typed items. |
 | `boolean`    | `true`                  | True or false. |
 | `number`     | `56.77`                 | 64 bit float. |
-| `raw_string` | `brown cow`             | Text written without enclosing double-quotes. |
 | `string`     | `"brown cow"`           | Text.       |
 | `struct`     | `{"k1":"v1","k2":"v2"}` | Structured content. |
 

eslint.config.mjs

@@ -1,6 +1,7 @@
 /* eslint-disable import/no-default-export */
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { existsSync } from 'node:fs';
 import localRules from 'eslint-plugin-local-rules';
 import js from '@eslint/js';
 import { FlatCompat } from '@eslint/eslintrc';
@@ -13,6 +14,23 @@ const compat = new FlatCompat({
   allConfig: js.configs.all,
 });
 
+const extendConfigs = [
+  'plugin:@gitlab/default',
+  'plugin:@gitlab/i18n',
+  'plugin:no-jquery/slim',
+  'plugin:no-jquery/deprecated-3.4',
+  'plugin:no-unsanitized/recommended-legacy',
+  './tooling/eslint-config/conditionally_ignore.js',
+  'plugin:@gitlab/jest',
+];
+
+// Allowing JiHu to add rules on their side since the update from
+// eslintrc.yml to eslint.config.mjs is not allowing subdirectory
+// rewrite.
+if (existsSync(path.resolve(dirname, 'jh'))) {
+  extendConfigs.push('./jh/eslint.config.js');
+}
+
 const jestConfig = {
   files: ['{,ee/}spec/frontend/**/*.js'],
 
@@ -65,15 +83,7 @@ export default [
       'spec/fixtures/**/*.graphql',
     ],
   },
-  ...compat.extends(
-    'plugin:@gitlab/default',
-    'plugin:@gitlab/i18n',
-    'plugin:no-jquery/slim',
-    'plugin:no-jquery/deprecated-3.4',
-    'plugin:no-unsanitized/recommended-legacy',
-    './tooling/eslint-config/conditionally_ignore.js',
-    'plugin:@gitlab/jest',
-  ),
+  ...compat.extends(...extendConfigs),
   ...compat.plugins('no-jquery', '@graphql-eslint'),
   {
     files: ['**/*.{js,vue}'],
@@ -114,7 +124,7 @@ export default [
       'import/no-unresolved': [
         'error',
         {
-          ignore: ['^(ee|jh)_component/'],
+          ignore: ['^(ee|jh)_component/', '^jh_else_ee/'],
         },
       ],
 

jest.config.base.js

@@ -116,6 +116,8 @@ module.exports = (path, options = {}) => {
     '^shared_queries(/.*)$': '<rootDir>/app/graphql/queries$1',
     '^ee_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1',
     '^jh_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1',
+    '^jh_else_ee(/.*)$':
+      '<rootDir>/app/assets/javascripts/vue_shared/components/empty_component.js',
     '^any_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1',
     '^helpers(/.*)$': '<rootDir>/spec/frontend/__helpers__$1',
     '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1',

locale/gitlab.pot

@@ -50038,7 +50038,7 @@ msgstr ""
 msgid "SecurityOrchestration|Security policy projects store your organization's security policies. They are identified when policies are created, or when a project is linked as a security policy project. %{linkStart}Learn more%{linkEnd}."
 msgstr ""
 
-msgid "SecurityOrchestration|Security policy scheduled scans maximum concurrency"
+msgid "SecurityOrchestration|Security policy scheduled scans maximum top-level group concurrency"
 msgstr ""
 
 msgid "SecurityOrchestration|SecurityOrchestration|Scan execution policies with more than %{maxCount} actions detected. Those policies will not work after GitLab 18.0 (May 15, 2025). Before then you must edit these policies to reduce the number of actions."

spec/frontend/ide/init_gitlab_web_ide_spec.js

@@ -121,7 +121,6 @@ describe('ide/init_gitlab_web_ide', () => {
           signIn: TEST_SIGN_IN_PATH,
         },
         featureFlags: {
-          settingsSync: true,
           crossOriginExtensionHost: false,
         },
         editorFont: {
@@ -269,7 +268,6 @@ describe('ide/init_gitlab_web_ide', () => {
         findRootElement(),
         expect.objectContaining({
           featureFlags: {
-            settingsSync: true,
             crossOriginExtensionHost: true,
           },
         }),
@@ -291,7 +289,6 @@ describe('ide/init_gitlab_web_ide', () => {
           findRootElement(),
           expect.objectContaining({
             featureFlags: {
-              settingsSync: true,
               crossOriginExtensionHost: true,
             },
           }),

spec/graphql/resolvers/merge_requests_resolver_spec.rb

@@ -175,6 +175,17 @@
       end
     end
 
+    context 'with negated target branches argument' do
+      it 'excludes merge requests with given target branches from selection' do
+        mrs = [merge_request_3, merge_request_4]
+        branches = mrs.map(&:target_branch)
+        result = resolve_mr(project, not: { target_branches: branches })
+
+        expect(result).not_to include(merge_request_3, merge_request_4)
+        expect(result).to include(merge_request_1, merge_request_2, merge_request_5, merge_request_6)
+      end
+    end
+
     context 'with state argument' do
       it 'takes one argument' do
         result = resolve_mr(project, state: 'locked')

storybook/config/webpack.config.js

@@ -199,6 +199,14 @@ module.exports = function storybookWebpackConfig({ config }) {
     );
   }
 
+  if (!IS_EE && !IS_JH) {
+    config.plugins.push(
+      new webpack.NormalModuleReplacementPlugin(/^jh_else_ee\/(.*)\.vue/, (resource) => {
+        resource.request = EMPTY_VUE_COMPONENT_PATH;
+      }),
+    );
+  }
+
   const baseIntegrationTestHelpersPath = 'spec/frontend_integration/test_helpers';
 
   // Add any missing aliases from the main GitLab webpack config

vite.config.js

@@ -59,13 +59,21 @@ const JH_ALIAS_FALLBACK = [
   },
 ];
 
+const JH_ELSE_EE_ALIAS_FALLBACK = [
+  {
+    find: /^jh_else_ee\/(.*)\.vue/,
+    replacement: emptyComponent,
+  },
+];
+
 export default defineConfig({
   cacheDir: path.resolve(__dirname, 'tmp/cache/vite'),
   resolve: {
     alias: [
       ...aliasArr,
       ...(IS_EE ? [] : EE_ALIAS_FALLBACK),
       ...(IS_JH ? [] : JH_ALIAS_FALLBACK),
+      ...(!IS_EE && !IS_JH ? JH_ELSE_EE_ALIAS_FALLBACK : []),
       {
         find: '~/',
         replacement: javascriptsPath,