[merge-train skip]

[ci skip]

[ci skip]

Ensure runner taggings are copied from taggings

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186278



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Pedro Pombeiro <noreply@pedro.pombei.ro>
Co-authored-by: Max Woolf <mwoolf@gitlab.com>
Co-authored-by: Marius Bobin <mbobin@gitlab.com>

Changelog: fixed

Merge branch 'pedropombeiro/520092/backports/17.9/no-op-ci_runner_machines_687967fa8a-backfill' into '17-9-stable-ee' 

No-op ci_runner_machines_687967fa8a batched migrations - 17.9 backport

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185303



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Marius Bobin <mbobin@gitlab.com>
Co-authored-by: Pedro Pombeiro <noreply@pedro.pombei.ro>

The backfill on this table is causing issues due to a problem in the
timing of the post-deployment migrations:

1. 20241107064635_queue_backfill_ci_runner_machines_partitioned_table
2. 20241211072300_retry_add_fk_from_p_ci_runner_managers_to_p_ci_runners
3. 20241219100359_requeue_backfill_ci_runners_partitioned_table

Migration 2 installs a FK check before the target table
(ci_runners_e59bb2812d) is backfilled in migration 3,
so we have https://gitlab.com/gitlab-org/gitlab/-/issues/520092.
We can afford to not backfill ci_runner_machines_687967fa8a,
since it'll be populated with runner data automatically as they
request jobs from the GitLab instance.

Changelog: other

[merge-train skip]

[ci skip]

[ci skip]

Sync organization user access when admin status changes

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4847



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Leonardo da Rosa <ldarosa@gitlab.com>
Approved-by: Suraj Tripathi <stripathi@gitlab.com>
Co-authored-by: Rutger Wessels <rwessels@gitlab.com>

Merge branch 'security-516271-skip-owner-creation-17-9' into '17-9-stable-ee'

See merge request gitlab-org/security/gitlab!4847

Changelog: security

Prevent XSS via merge error on the merge request page

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4880



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Phil Hughes <me@iamphill.com>
Co-authored-by: Jacques <jerasmus@gitlab.com>

Merge branch 'security-SECURITY/mr-error-xss-17-9' into '17-9-stable-ee'

See merge request gitlab-org/security/gitlab!4880

Changelog: security

Inherit current_user external status while rotating project/group token

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4866



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Mohamed Hamda <mhamda@gitlab.com>
Co-authored-by: Bogdan Denkovych <bdenkovych@gitlab.com>

Merge branch 'security-issue-509324-17-9' into '17-9-stable-ee'

See merge request gitlab-org/security/gitlab!4866

Changelog: security

Add validations for the project_name of Harbor integration

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4857



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: David Fernandez <dfernandez@gitlab.com>
Co-authored-by: Dzmitry Meshcharakou <12459192-dmeshcharakou@users.noreply.gitlab.com>

Merge branch 'security-1274-harbor-project-name-validation-17-9' into '17-9-stable-ee'

See merge request gitlab-org/security/gitlab!4857

Changelog: security

Sanitize returned input on asciidoc Timeout

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4842



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Hunter Stewart <hustewart@gitlab.com>
Co-authored-by: Olaoluwa Oluro <olaoluro@gitlab.com>

Merge branch 'security-csp-bypass-xss-user-profile-17-9' into '17-9-stable-ee'

See merge request gitlab-org/security/gitlab!4842

Changelog: security

Add CI/CD project setting `allow_composite_identities_to_run_pipelines`

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4875



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Avielle Wolfe <awolfe@gitlab.com>
Reviewed-by: Rajendra Kadam <rkadam@gitlab.com>
Co-authored-by: Laura Montemayor <lmontemayor@gitlab.com>

Merge branch 'security-add-cicd-setting-amazon-q-17-9' into '17-9-stable-ee'

See merge request gitlab-org/security/gitlab!4875

Changelog: security

Merge branch 'security-add-limit-to-terraform-merge-request-report-entries-17-9' into '17-9-stable-ee'

Add limit to resource counts in tfplan merge request report

See merge request https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/4871



Merged-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>
Approved-by: Fabio Pitino <fpitino@gitlab.com>
Co-authored-by: Tiger <twatson@gitlab.com>

Merge branch 'security-add-limit-to-terraform-merge-request-report-entries-17-9' into '17-9-stable-ee'

See merge request gitlab-org/security/gitlab!4871

Changelog: security

Merge branch 'eju/backport/gitaly-issue-6674/bump-gitalyclient-dependency-version' into '17-9-stable-ee' 

Update Gitaly client dependency to include DNS lookup change (backport to 17.9)

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184639



Merged-by: Jenny Kim <yjeankim@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Reviewed-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Eric Ju <eju@gitlab.com>

In https://gitlab.com/gitlab-org/gitaly/-/merge_requests/7692,
Gitaly backports a change. The change updates how the client
dials connections, including changes to DNS lookups.
This commit manually updates the workhorse's Gitaly client dependency
to include that change.

[Backport 17.9] Replace #test-platform in favour of #s_developer_experience

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/185157



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Désirée Chevalier <dchevalier@gitlab.com>

- /scripts/generate-failed-test-on-omnibus-mr-message.rb
- /scripts/generate-message-to-run-e2e-pipeline.rb
- /doc/development/testing_guide/end_to_end/beginners_guide/page_objects.md
- /doc/development/testing_guide/end_to_end/beginners_guide/resources.md
- /doc/development/testing_guide/end_to_end/_index.md
- /doc/development/ai_features/duo_chat.md
- /spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb
- /.gitlab/issue_templates/Feature Flag Roll Out.md
- /danger/stable_branch_patch/Dangerfile
- /qa/qa/scenario/test/sanity/selectors.rb

Reorder runners backfill migrations - 17.9 backport

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184345



Merged-by: Marius Bobin <mbobin@gitlab.com>
Approved-by: Leonardo da Rosa <ldarosa@gitlab.com>

It ensures that the runners are copied to the new
table before we copy the taggings.

Changelog: fixed

[Backport 17.9] Update truncato gem

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184162



Merged-by: Ravi Kumar <rkumar@gitlab.com>
Approved-by: Ravi Kumar <rkumar@gitlab.com>
Co-authored-by: Terri Chu <tchu@gitlab.com>

Update truncato gem

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/182200



Merged-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Reviewed-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: Chad Lavimoniere <clavimoniere@gitlab.com>

(cherry picked from commit 09c29adb)

8fa7d592

 Update truncato

Co-authored-by: Dmitry Gruzd <dgruzd@gitlab.com>

[17.9] Backport: Zoekt: Index pending delete projects

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183491



Merged-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Ravi Kumar <rkumar@gitlab.com>
Approved-by: Will Meek <wmeek@gitlab.com>

[backport] Fixed regex and syntax options button under some conditions

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184158



Merged-by: Alexander Turinske <aturinske@gitlab.com>
Approved-by: Alexander Turinske <aturinske@gitlab.com>
Co-authored-by: Tomas Bulva <tbulva@gitlab.com>

Update dependency gitlab-mail_room to v0.0.27

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184190



Merged-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Approved-by: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

[merge-train skip]

[ci skip]

[ci skip]