Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/repository/components/header_area/blob_button_group.vue

@@ -23,7 +23,7 @@ export default {
   },
   mixins: [getRefMixin, glFeatureFlagMixin()],
   inject: {
-    targetBranch: {
+    selectedBranch: {
       default: '',
     },
     originalBranch: {
@@ -125,7 +125,7 @@ export default {
       :ref="$options.replaceBlobModalId"
       :modal-id="$options.replaceBlobModalId"
       :commit-message="replaceCommitMessage"
-      :target-branch="targetBranch || currentRef"
+      :target-branch="selectedBranch || currentRef"
       :original-branch="originalBranch || currentRef"
       :can-push-code="userPermissions.pushCode"
       :can-push-to-branch="blobInfo.canCurrentUserPushToBranch"

app/assets/javascripts/repository/components/header_area/blob_delete_file_group.vue

@@ -13,7 +13,7 @@ export default {
     DeleteBlobModal,
   },
   inject: {
-    targetBranch: {
+    selectedBranch: {
       default: '',
     },
     originalBranch: {
@@ -101,7 +101,7 @@ export default {
       :delete-path="blobInfo.webPath"
       :modal-id="deleteModalId"
       :commit-message="deleteModalCommitMessage"
-      :target-branch="targetBranch || currentRef"
+      :target-branch="selectedBranch || currentRef"
       :original-branch="originalBranch || currentRef"
       :can-push-code="userPermissions.pushCode"
       :can-push-to-branch="blobInfo.canCurrentUserPushToBranch"

app/assets/stylesheets/framework/common.scss

@@ -157,14 +157,6 @@ hr {
 
 .item-title { font-weight: $gl-font-weight-bold; }
 
-.author-link {
-  color: $blue-600;
-}
-
-.author-link:hover {
-  text-decoration: none;
-}
-
 table {
   a code {
     position: relative;

app/helpers/projects_helper.rb

@@ -71,7 +71,7 @@ def link_to_member(author, opts = {}, &block)
       testid: "author-link"
     }
 
-    inject_classes = ["author-link", opts[:extra_class]]
+    inject_classes = ["author-link gl-text-link", opts[:extra_class]]
 
     if opts[:name]
       inject_classes.concat(["js-user-link", opts[:mobile_classes]])

db/docs/batched_background_migrations/backfill_epic_issues_namespace_id.yml

@@ -5,4 +5,4 @@ feature_category: portfolio_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156640
 milestone: '17.3'
 queued_migration_version: 20240618123929
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: '20250217231408'

db/post_migrate/20250217231408_finalize_hk_backfill_epic_issues_namespace_id.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class FinalizeHkBackfillEpicIssuesNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.10'
+
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillEpicIssuesNamespaceId',
+      table_name: :epic_issues,
+      column_name: :id,
+      job_arguments: [:namespace_id, :issues, :namespace_id, :issue_id],
+      finalize: true
+    )
+  end
+
+  def down; end
+end

db/schema_migrations/20250217231408

@@ -0,0 +1 @@
+75931898031ea16327d1991ad7bb2e5aace0d1c94336de6c667acca2b99aa8c8

doc/administration/clusters/kas.md

@@ -46,7 +46,8 @@ To disable the agent server on a single node:
 
 #### Turn on KAS on multiple nodes
 
-KAS instances communicate with each other by registering their private addresses in Redis at a well-known location. Each KAS must be configured with its specific location details so that other instances can reach it.
+KAS instances communicate with each other by registering their private addresses in Redis at a well-known location.
+Each KAS must be configured to present its private address details so that other instances can reach it.
 
 To turn on KAS on multiple nodes:
 

doc/ci/environments/external_deployment_tools.md

@@ -46,7 +46,7 @@ You can create a [project access token](../../user/project/settings/project_acce
 
 ### Example: Track deployments of ArgoCD
 
-You can use [ArgoCD webhook](https://argocd-notifications.readthedocs.io/en/stable/services/webhook/) to send deployment events to GitLab Deployment API.
+You can use [ArgoCD webhook](https://argo-cd.readthedocs.io/en/stable/operator-manual/notifications/services/webhook/) to send deployment events to GitLab Deployment API.
 Here is an example setup that creates a `success` deployment record in GitLab when ArgoCD successfully deploys a new revision:
 
 1. Create a new webhook. You can save the following manifest file and apply it by `kubectl apply -n argocd -f <manifiest-file-path>`:
@@ -93,7 +93,7 @@ Here is an example setup that creates a `success` deployment record in GitLab wh
 
 {{< alert type="note" >}}
 
-If a deployment wasn't created as expected, you can troubleshoot with [`argocd-notifications` tool](https://argocd-notifications.readthedocs.io/en/stable/troubleshooting/).
+If a deployment wasn't created as expected, you can troubleshoot with [`argocd-notifications` tool](https://argo-cd.readthedocs.io/en/stable/operator-manual/notifications/troubleshooting/).
 For example, `argocd-notifications template notify gitlab-deployment-status <your-app-name> --recipient gitlab:argocd-notifications`
 triggers API request immediately and renders an error message from GitLab API server if any.
 

doc/user/compliance/audit_event_types.md

@@ -149,6 +149,8 @@ Audit event types belong to the following product categories.
 | [`allow_committer_approval_updated`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102256) | Prevent approvals by users who add commits setting is updated | {{< icon name="check-circle" >}} Yes | GitLab [15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/373949) | Group |
 | [`allow_overrides_to_approver_list_per_merge_request_updated`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102256) | Prevent editing approval rules in projects and merge requests setting is updated | {{< icon name="check-circle" >}} Yes | GitLab [15.6](https://gitlab.com/gitlab-org/gitlab/-/issues/373949) | Group |
 | [`audit_events_streaming_headers_update`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92068) | A streaming header for audit events is updated | {{< icon name="check-circle" >}} Yes | GitLab [15.3](https://gitlab.com/gitlab-org/gitlab/-/issues/366350) | Group |
+| [`compliance_control_status_fail`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180107) | A compliance control status is updated to fail | {{< icon name="check-circle" >}} Yes | GitLab [17.10](https://gitlab.com/gitlab-org/gitlab/-/issues/513425) | Project |
+| [`compliance_control_status_pass`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/180107) | A compliance control status is updated to pass | {{< icon name="check-circle" >}} Yes | GitLab [17.10](https://gitlab.com/gitlab-org/gitlab/-/issues/513425) | Project |
 | [`compliance_framework_added`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/157893) | A compliance framework is applied to a project | {{< icon name="check-circle" >}} Yes | GitLab [17.2](https://gitlab.com/gitlab-org/gitlab/-/issues/464160) | Project |
 | [`compliance_framework_deleted`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65343) | A compliance framework is removed from a project | {{< icon name="check-circle" >}} Yes | GitLab [14.1](https://gitlab.com/gitlab-org/gitlab/-/issues/329362) | Project |
 | [`compliance_framework_id_updated`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94711) | A compliance framework is updated for a project | {{< icon name="check-circle" >}} Yes | GitLab [15.7](https://gitlab.com/gitlab-org/gitlab/-/issues/369310) | Project |

locale/gitlab.pot

@@ -24663,6 +24663,9 @@ msgstr ""
 msgid "Failed to update branch!"
 msgstr ""
 
+msgid "Failed to update compliance control status. Error: %{error_message}"
+msgstr ""
+
 msgid "Failed to update compliance requirement"
 msgstr ""
 

spec/frontend/repository/components/header_area/blob_button_group_spec.js

@@ -18,7 +18,7 @@ const DEFAULT_PROPS = {
 };
 
 const DEFAULT_INJECT = {
-  targetBranch: 'master',
+  selectedBranch: 'root-main-patch-07420',
   originalBranch: 'master',
   blobInfo: blobControlsDataMock.repository.blobs.nodes[0],
 };
@@ -113,7 +113,7 @@ describe('BlobButtonGroup component', () => {
   it('renders UploadBlobModal', () => {
     expect(findUploadBlobModal().props()).toMatchObject({
       commitMessage: 'Replace file.js',
-      targetBranch: 'master',
+      targetBranch: 'root-main-patch-07420',
       originalBranch: 'master',
       canPushCode: true,
       path: 'some/file.js',

spec/frontend/repository/components/header_area/blob_delete_file_group_spec.js

@@ -18,7 +18,7 @@ const DEFAULT_PROPS = {
 };
 
 const DEFAULT_INJECT = {
-  targetBranch: 'master',
+  selectedBranch: 'root-main-patch-07420',
   originalBranch: 'master',
   blobInfo: blobControlsDataMock.repository.blobs.nodes[0],
 };
@@ -112,7 +112,7 @@ describe('BlobDeleteFileGroup component', () => {
   it('renders DeleteBlobModal', () => {
     expect(findDeleteBlobModal().props()).toMatchObject({
       commitMessage: 'Delete file.js',
-      targetBranch: 'master',
+      targetBranch: 'root-main-patch-07420',
       originalBranch: 'master',
       canPushCode: true,
       emptyRepo: false,