Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/CODEOWNERS

@@ -1248,6 +1248,10 @@ lib/gitlab/checks/**
 /doc/user/workspace/ @brendan777
 # End rake-managed-docs-block
 
+# i18n Docs
+[Localization Team] @gitlab-com/localization/maintainers
+/doc-locale/**
+
 [Authorization] @gitlab-org/software-supply-chain-security/authorization/approvers
 /config/initializers/declarative_policy.rb
 /config/initializers/declarative_policy_cached_attributes.rb

.gitlab/ci/docs.gitlab-ci.yml

@@ -137,3 +137,22 @@ docs-lint redirects:
     - source scripts/utils.sh
   script:
     - run_with_custom_exit_code ./scripts/lint-docs-redirects.rb
+
+docs-i18n-lint markdown:
+  extends:
+    - .default-retry
+    - .docs:rules:docs-i18n-lint
+    - .docs-markdown-lint-image
+    - .yarn-cache
+  stage: lint
+  needs: []
+  script:
+    - source ./scripts/utils.sh
+    - |
+      function docs_lint_markdown() {
+        yarn_install_script
+        install_gitlab_gem
+        scripts/lint-i18n-doc.sh
+      }
+
+      run_with_custom_exit_code docs_lint_markdown

.gitlab/ci/qa-common/variables.gitlab-ci.yml

@@ -18,7 +18,7 @@ variables:
   # Helm chart ref used by test-on-cng pipeline
   GITLAB_HELM_CHART_REF: "074bb942c9c65613c2576ce418f59b8577fff37c"
   # Specific ref for cng-mirror project to trigger builds for
-  GITLAB_CNG_MIRROR_REF: "56b6a062b05d549e0b69f79b759107e4956151eb"
+  GITLAB_CNG_MIRROR_REF: "a200886cbfb7e1f5a7642838f8f8fac9f26c6a97"
   # Makes sure some of the common scripts from pipeline-common use bundler to execute commands
   RUN_WITH_BUNDLE: "true"
   # Makes sure reporting script defined in .gitlab-qa-report from pipeline-common is executed from correct folder

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

@@ -321,6 +321,15 @@
   - "scripts/frontend/lint_docs_links.mjs"
   - "tooling/eslint-config/eslint-local-rules/**/*"
 
+.docs-i18n-patterns: &docs-i18n-patterns
+  - "doc-locale/**/*"
+  - "scripts/lint-i18n-doc.sh"
+
+.if-tech-docs-localization: &if-tech-docs-localization
+  if: '($CI_PROJECT_PATH == "gitlab-com/localization" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH) ||
+      ($CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train") ||
+      ($CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^docs-i18n-/ || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /-docs-i18n$/)'
+
 .docs-deprecations-and-removals-patterns: &docs-deprecations-and-removals-patterns
   - "doc/update/breaking_windows.md"
   - "doc/update/deprecations.md"
@@ -1266,6 +1275,11 @@
     - <<: *if-default-refs
       changes: *docs-patterns
 
+.docs:rules:docs-i18n-lint:
+  rules:
+    - <<: *if-tech-docs-localization
+      changes: *docs-i18n-patterns
+
 .docs:rules:deprecations-and-removals:
   rules:
     - <<: *if-default-refs

app/assets/javascripts/pages/projects/issues/show/index.js

@@ -1,4 +1,5 @@
 import { issuableInitialDataById, isLegacyIssueType } from '~/issues/show/utils/issuable_data';
+import { WORK_ITEM_TYPE_NAME_ISSUE } from '~/work_items/constants';
 
 const initLegacyIssuePage = async () => {
   const [{ initShow }] = await Promise.all([import('~/issues')]);
@@ -8,7 +9,7 @@ const initLegacyIssuePage = async () => {
 const initWorkItemPage = async () => {
   const [{ initWorkItemsRoot }] = await Promise.all([import('~/work_items')]);
 
-  initWorkItemsRoot({ workItemType: 'issue' });
+  initWorkItemsRoot({ workItemType: WORK_ITEM_TYPE_NAME_ISSUE });
 };
 
 const issuableData = issuableInitialDataById('js-issuable-app');

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

@@ -2,7 +2,7 @@
 import { GlBreadcrumb } from '@gitlab/ui';
 import { s__, __ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import { ROUTES, WORK_ITEM_TYPE_ENUM_EPIC } from '../constants';
+import { ROUTES, WORK_ITEM_TYPE_NAME_EPIC } from '../constants';
 
 const BREADCRUMB_LABELS = {
   workItemList: s__('WorkItem|Work items'),
@@ -30,7 +30,7 @@ export default {
       return this.glFeatures.workItemPlanningView;
     },
     isEpicsList() {
-      return this.workItemType === WORK_ITEM_TYPE_ENUM_EPIC;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC;
     },
     listName() {
       if (this.isWorkItemOnly) {

app/assets/javascripts/work_items/index.js

@@ -8,7 +8,7 @@ import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { injectVueAppBreadcrumbs } from '~/lib/utils/breadcrumbs';
 import { apolloProvider } from '~/graphql_shared/issuable_client';
-import { ISSUE_WIT_FEEDBACK_BADGE } from '~/work_items/constants';
+import { ISSUE_WIT_FEEDBACK_BADGE, WORK_ITEM_TYPE_NAME_ISSUE } from '~/work_items/constants';
 import App from './components/app.vue';
 import WorkItemBreadcrumb from './components/work_item_breadcrumb.vue';
 import activeDiscussionQuery from './components/design_management/graphql/client/active_design_discussion.query.graphql';
@@ -63,7 +63,7 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType, withTabs } = {}
   } = el.dataset;
 
   const isGroup = workspaceType === WORKSPACE_GROUP;
-  const router = createRouter({ fullPath, workItemType, workspaceType, defaultBranch, isGroup });
+  const router = createRouter({ fullPath, workspaceType, defaultBranch, isGroup });
   let listPath = issuesListPath;
 
   const breadcrumbParams = { workItemType: listWorkItemType, isGroup };
@@ -97,7 +97,7 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType, withTabs } = {}
   }
 
   if (
-    workItemType === 'issue' &&
+    workItemType === WORK_ITEM_TYPE_NAME_ISSUE &&
     gon.features.workItemsViewPreference &&
     !isGroup &&
     !gon.features.useWiViewForIssues

app/assets/javascripts/work_items/pages/work_items_list_app.vue

@@ -86,10 +86,12 @@ import DateToken from '~/vue_shared/components/filtered_search_bar/tokens/date_t
 import { getParameterByName, removeParams, updateHistory } from '~/lib/utils/url_utility';
 import {
   DETAIL_VIEW_QUERY_PARAM_NAME,
+  NAME_TO_ENUM_MAP,
   STATE_CLOSED,
   STATE_OPEN,
   WORK_ITEM_TYPE_ENUM_EPIC,
   WORK_ITEM_TYPE_ENUM_ISSUE,
+  WORK_ITEM_TYPE_NAME_EPIC,
 } from '../constants';
 import getWorkItemsQuery from '../graphql/list/get_work_items.query.graphql';
 import getWorkItemStateCountsQuery from '../graphql/list/get_work_item_state_counts.query.graphql';
@@ -264,7 +266,7 @@ export default {
       return this.isEpicsList ? this.glFeatures.epicsListDrawer : this.glFeatures.issuesListDrawer;
     },
     isEpicsList() {
-      return this.workItemType === WORK_ITEM_TYPE_ENUM_EPIC;
+      return this.workItemType === WORK_ITEM_TYPE_NAME_EPIC;
     },
     hasSearch() {
       return Boolean(this.searchQuery);
@@ -280,6 +282,7 @@ export default {
     },
     queryVariables() {
       const hasGroupFilter = Boolean(this.urlFilterParams.group_path);
+      const singleWorkItemType = this.workItemType ? NAME_TO_ENUM_MAP[this.workItemType] : null;
       return {
         fullPath: this.fullPath,
         sort: this.sortKey,
@@ -289,7 +292,7 @@ export default {
         ...this.pageParams,
         excludeProjects: hasGroupFilter || this.isEpicsList,
         includeDescendants: !hasGroupFilter,
-        types: this.apiFilterParams.types || this.workItemType || this.defaultWorkItemTypes,
+        types: this.apiFilterParams.types || singleWorkItemType || this.defaultWorkItemTypes,
         isGroup: this.isGroup,
       };
     },
@@ -550,10 +553,8 @@ export default {
     enableClientSideBoardsExperiment() {
       return this.glFeatures.workItemsClientSideBoards;
     },
-    workItemTypeName() {
-      return this.workItemType === WORK_ITEM_TYPE_ENUM_EPIC
-        ? WORK_ITEM_TYPE_ENUM_EPIC
-        : WORK_ITEM_TYPE_ENUM_ISSUE;
+    preselectedWorkItemType() {
+      return this.isEpicsList ? WORK_ITEM_TYPE_ENUM_EPIC : WORK_ITEM_TYPE_ENUM_ISSUE;
     },
   },
   watch: {
@@ -919,7 +920,7 @@ export default {
         <template #new-issue-button>
           <create-work-item-modal
             :is-group="isGroup"
-            :preselected-work-item-type="workItemTypeName"
+            :preselected-work-item-type="preselectedWorkItemType"
             @workItemCreated="handleWorkItemCreated"
           />
         </template>

app/models/projects/topic.rb

@@ -7,12 +7,10 @@ class Topic < ApplicationRecord
     include Avatarable
     include CacheMarkdownField
     include Gitlab::SQL::Pattern
-    include SafelyChangeColumnDefault
 
     SLUG_ALLOWED_REGEX = %r{\A[a-zA-Z0-9_\-.]+\z}
 
     cache_markdown_field :description
-    columns_changing_default :organization_id
 
     validates :name, presence: true, length: { maximum: 255 }
     validates :description, length: { maximum: 1024 }

app/views/projects/branch_rules/_show.html.haml

@@ -8,11 +8,10 @@
   id: 'branch-rules',
   testid: 'branch-rules-content',
   expanded: expanded) do |c|
-  - c.with_callout do
-    - if Feature.enabled?(:edit_branch_rules, @project)
-      = render 'projects/settings/branch_rules_callout'
   - c.with_description do
     = _('Define rules for who can push, merge, and the required approvals for each branch.')
     = link_to(_('Leave feedback.'), 'https://gitlab.com/gitlab-org/gitlab/-/issues/388149', target: '_blank', rel: 'noopener noreferrer')
   - c.with_body do
+    - if Feature.enabled?(:edit_branch_rules, @project)
+      .gl-mb-5= render 'projects/settings/branch_rules_callout'
     #js-branch-rules{ data: { project_path: @project.full_path, branch_rules_path: project_settings_repository_branch_rules_path(@project), show_code_owners: show_code_owners.to_s, show_status_checks: show_status_checks.to_s, show_approvers: show_approvers.to_s, show_enterprise_access_levels: show_enterprise_access_levels.to_s } }

config/feature_flags/beta/allow_ldap_users_to_authenticate_with_gitlab_username.yml

@@ -0,0 +1,9 @@
+---
+name: allow_ldap_users_to_authenticate_with_gitlab_username
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/215357
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186848
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/536008
+milestone: '18.0'
+group: group::authentication
+type: beta
+default_enabled: true

data/deprecations/17-9-enable-gitlab-advanced-sast-by-default.yml

@@ -1,5 +1,5 @@
 - title: "GitLab Advanced SAST will be enabled by default"
-  removal_milestone: "18.0"
+  removal_milestone: "19.0"
   announcement_milestone: "17.9"
   breaking_change: true
   window: 1
@@ -12,7 +12,7 @@
   resolution_role: Developer
   manual_task: true
   body: |  # (required) Don't change this line.
-    In GitLab 18.0, we will update the [SAST CI/CD templates](https://docs.gitlab.com/user/application_security/sast#stable-vs-latest-sast-templates) to enable [GitLab Advanced SAST](https://docs.gitlab.com/user/application_security/sast/gitlab_advanced_sast) by default in projects with GitLab Ultimate.
+    In GitLab 19.0, we will update the [SAST CI/CD templates](https://docs.gitlab.com/user/application_security/sast#stable-vs-latest-sast-templates) to enable [GitLab Advanced SAST](https://docs.gitlab.com/user/application_security/sast/gitlab_advanced_sast) by default in projects with GitLab Ultimate.
     Before this change, the GitLab Advanced SAST analyzer was enabled only if you set the CI/CD variable `GITLAB_ADVANCED_SAST_ENABLED` to `true`.
 
     Advanced SAST delivers more accurate results by using cross-file, cross-function scanning and a new ruleset.