[ci skip]

[ci skip]

[ci skip]

Fix secret detection remote ruleset variable suggestion

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



Merged-by: Alexander Turinske <aturinske@gitlab.com>
Approved-by: Alexander Turinske <aturinske@gitlab.com>
Co-authored-by: Andy Soiron <asoiron@gitlab.com>

Fix main-jh pipeline sync issue on integration

See merge request gitlab-cn/gitlab!1972

Keep SAML Identity when deprovisioning via SCIM

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



Merged-by: Jessie Young <jessieyoung@gitlab.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Reviewed-by: Drew Blessing <drew@gitlab.com>
Co-authored-by: Jon Glassman <jglassman@gitlab.com>

* This was previously added behind a default disabled feature flag out of an abundance of caution: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/120049
* The feature was enabled, but then a minor issue was discovered: https://gitlab.com/gitlab-org/gitlab/-/issues/413079
* As a result, it was disabled until the issue was fixed.
* That fix was deployed behind the same feature flag: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128588
* The feature flag was re-rolled out on August 11: https://gitlab.com/gitlab-org/gitlab/-/issues/410234#note_1508682346
* Now, we are removing the feature flag entirely.

Changelog: changed
EE: true

E2E: Quarantine vulnerability_management_spec

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



Merged-by: Chloe Liu <yliu@gitlab.com>
Approved-by: Chloe Liu <yliu@gitlab.com>
Co-authored-by: Valerie Burton <vburton@gitlab.com>

Update dependency webmock to '~> 3.19.1'

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



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

docs: Update storage path examples

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



Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: Will Chandler <wchandler@gitlab.com>

Remove redundant 'plan' from order summary details

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



Merged-by: Michael Lunøe <michael.lunoe@gmail.com>
Approved-by: Diana Zubova <dzubova@gitlab.com>
Approved-by: Michael Lunøe <michael.lunoe@gmail.com>
Reviewed-by: Michael Lunøe <michael.lunoe@gmail.com>
Co-authored-by: Paulo Barros <pbarros@gitlab.com>

Allow guest user seat assignment

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Josianne Hyson <jhyson@gitlab.com>
Reviewed-by: Josianne Hyson <jhyson@gitlab.com>
Reviewed-by: Bishwa Hang Rai <bhrai@gitlab.com>
Co-authored-by: Bishwa Hang Rai <bhrai@gitlab.com>

Merge branch '229873-updated-user-list-component-error-message-to-be-more-actionable' into 'master' 

Update user list component error message

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



Merged-by: Frédéric Caplette <fcaplette@gitlab.com>
Approved-by: Frédéric Caplette <fcaplette@gitlab.com>
Co-authored-by: Taliesin Millhouse <30204322+strongishllama@users.noreply.github.com>

Fix the date filter on the global time tracking report

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



Merged-by: Payton Burdette <pburdette@gitlab.com>
Approved-by: Payton Burdette <pburdette@gitlab.com>
Approved-by: Deepika Guliani <dguliani@gitlab.com>
Reviewed-by: Payton Burdette <pburdette@gitlab.com>
Reviewed-by: Deepika Guliani <dguliani@gitlab.com>
Co-authored-by: Oksana Kohuch <oksanakohuch-ext@gitlab.com>

Paths provided to `git_data_dirs` would implicitly have `/repositories`
appended to it when placing repositories on disk. However, the newer
`gitaly['configuration']['storage']` config format does not do this.

Our examples of storage paths with the new syntax leave off the trailing
`/repositories`, which if copied into an existing instance's config will
cause repositories to become inaccessible as the storage path was
accidentally changed. Update our examples to use the path admins will
intend to use.

Update dependency view_component to '~> 3.5.0'

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



Merged-by: Doug Stull <dstull@gitlab.com>
Approved-by: Thomas Hutterer <thutterer@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

Move javascripts/pipelines to javascripts/ci/pipeline_details

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



Merged-by: Payton Burdette <pburdette@gitlab.com>
Approved-by: Payton Burdette <pburdette@gitlab.com>
Co-authored-by: Frédéric Caplette <fcaplette@gitlab.com>

Restructure of the ci directories part 1.

Changelog: fixed

Refactor summarize diff feature to use abstraction layer

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



Merged-by: Kerri Miller <kerrizor@kerrizor.com>
Approved-by: Kerri Miller <kerrizor@kerrizor.com>
Reviewed-by: Marc Shaw <mshaw@gitlab.com>
Co-authored-by: Patrick Bajao <ebajao@gitlab.com>

This copies the logic in `MergeRequests::Llm::SumamrizeMergeRequestWorker`
and `Llm::MergeRequests::SummarizeDiffService` to several classes
following the AI feature abstraction layer.

Old classes are marked as deprecated and will be removed later on.

This is behind `summarize_diff_abstraction_layer` feature flag.

Update gdk docker image base

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



Merged-by: Jennifer Li <jli@gitlab.com>
Approved-by: Nao Hashizume <nhashizume@gitlab.com>
Approved-by: Jennifer Li <jli@gitlab.com>
Reviewed-by: Andrejs Cunskis <acunskis@gitlab.com>
Reviewed-by: Nao Hashizume <nhashizume@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

E2E: Quarantine overage_modal_spec

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



Merged-by: Tiffany Rea <trea@gitlab.com>
Approved-by: Tiffany Rea <trea@gitlab.com>
Co-authored-by: Valerie Burton <vburton@gitlab.com>

Update section layouts to only need one

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



Merged-by: Anna Vovchenko <avovchenko@gitlab.com>
Approved-by: Artur Fedorov <afedorov@gitlab.com>
Approved-by: Anna Vovchenko <avovchenko@gitlab.com>
Reviewed-by: Artur Fedorov <afedorov@gitlab.com>
Co-authored-by: Alexander Turinske <aturinske@gitlab.com>

URL parsing and sanitize logic added for Relay State

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



Merged-by: Jarka Košanová <jarka@gitlab.com>
Approved-by: Bogdan Denkovych <bdenkovych@gitlab.com>
Approved-by: Jarka Košanová <jarka@gitlab.com>
Approved-by: Félix Veillette-Potvin <fveillette@gitlab.com>
Reviewed-by: Bogdan Denkovych <bdenkovych@gitlab.com>
Co-authored-by: smriti <sgarg@gitlab.com>

Default Relay State is sent from Idp end during SAML SSO process.
This value is used for redirecting user to the subpath specified.
With this change we are making sure the user is only redirected to subpaths in application.
And the subpaths specified are not malicious

Changelog: changed
MR:
EE: true

Remove AiProxyHelper and related code

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



Merged-by: Aboobacker MK <akarakath@gitlab.com>
Approved-by: Aboobacker MK <akarakath@gitlab.com>
Approved-by: Nikola Milojevic <nmilojevic@gitlab.com>
Co-authored-by: Aleksei Lipniagov <alipniagov@gitlab.com>

Update gitlab-pages

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



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Approved-by: mo khan <mo@mokhan.ca>
Reviewed-by: mo khan <mo@mokhan.ca>
Co-authored-by: Nao Hashizume <nhashizume@gitlab.com>

Begin pruning down the Git index page

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



Merged-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Approved-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Reviewed-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Co-authored-by: Amy Qualls <aqualls@gitlab.com>