Changelog: other
EE: true

Revert "Merge branch 'renovate/dompurify-3.x' into 'master'"

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



Merged-by: Nao Hashizume <nhashizume@gitlab.com>
Approved-by: Nao Hashizume <nhashizume@gitlab.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>

Clarify Dedicated upgrades and patches

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



Merged-by: Lysanne Pinto <lpinto@gitlab.com>
Approved-by: Amy Shiel <ashiel@gitlab.com>
Approved-by: Oriol Lluch <olluch@gitlab.com>
Approved-by: Lysanne Pinto <lpinto@gitlab.com>
Reviewed-by: Chris Balane <cbalane@gitlab.com>
Co-authored-by: Chris Balane <cbalane@gitlab.com>

Co-authored-by: Lysanne Pinto <lpinto@gitlab.com>

Clarify possible inputs for `rules:changes:paths`

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



Merged-by: Lysanne Pinto <lpinto@gitlab.com>
Approved-by: Lysanne Pinto <lpinto@gitlab.com>
Co-authored-by: Manuel Grabowski <mgrabowski@gitlab.com>

Remove admin password reset from license fabrication

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



Merged-by: Tiffany Rea <trea@gitlab.com>
Approved-by: Tiffany Rea <trea@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

This reverts merge request !167301

Update Gitaly version

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



Merged-by: release-tools approver bot <project_278964_bot_77e28085fcec07f14dfd31c689824b5b@noreply.gitlab.com>
Approved-by: release-tools approver bot <project_278964_bot_77e28085fcec07f14dfd31c689824b5b@noreply.gitlab.com>
Co-authored-by: GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>

Raise error on lock retries exhaustion for non-transactional migrations

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



Merged-by: Leonardo da Rosa <ldarosa@gitlab.com>
Approved-by: Leonardo da Rosa <ldarosa@gitlab.com>
Reviewed-by: Leonardo da Rosa <ldarosa@gitlab.com>
Co-authored-by: Krasimir Angelov <kangelov@gitlab.com>

Add correct scope for Members::MemberApproval

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



Merged-by: Jason Goodman <jgoodman@gitlab.com>
Approved-by: Bishwa Hang Rai <bhrai@gitlab.com>
Approved-by: Jason Goodman <jgoodman@gitlab.com>
Reviewed-by: Bishwa Hang Rai <bhrai@gitlab.com>
Co-authored-by: Suraj Tripathi <stripathi@gitlab.com>

This ensures the module resolves correctly

Apply force push settings consistently

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



Merged-by: Joe Woodward <jwoodward@gitlab.com>
Approved-by: Naman Jagdish Gala <ngala@gitlab.com>
Approved-by: Jerry Seto <jseto@gitlab.com>
Reviewed-by: Joe Woodward <jwoodward@gitlab.com>
Co-authored-by: Joe Woodward <j@joewoodward.me>

We recently implemented group level protected branches. The feature is
still behind a disabled feature flag. During testing it was noted that
force push settings are applied differently to access levels.

When group-level access levels exist, we check if any of the
group-or-project-level access levels allow a user to do said action.
Before this change, when a group-level protected branch existed we would
completely ignore any project level protected branches.

After this change we check against all matching protected branches when
evaluating if a force push is allowed or not.

Add suffix strategy selector for Pipeline execution policy

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



Merged-by: Alexander Turinske <aturinske@gitlab.com>
Approved-by: Ryan Lehmann <rlehmann@gitlab.com>
Approved-by: Alexander Turinske <aturinske@gitlab.com>
Reviewed-by: Alexander Turinske <aturinske@gitlab.com>
Reviewed-by: Artur Fedorov <afedorov@gitlab.com>
Co-authored-by: Artur Fedorov <afedorov@gitlab.com>

Pipeline execution policy has
suffix strategy for name collision

Changelog: added
EE: true

Remove the glfm_specification testing files

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



Merged-by: Brett Walker <bwalker@gitlab.com>
Approved-by: Himanshu Kapoor <info@fleon.org>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>

Remove legacy value streams dashboard haml file

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



Merged-by: Felipe Cardozo <fcardozo@gitlab.com>
Approved-by: Alex Pennells <apennells@gitlab.com>
Approved-by: Felipe Cardozo <fcardozo@gitlab.com>
Co-authored-by: Ezekiel Kigbo <ekigbo@gitlab.com>

Adjust wording for pipeline's license tab

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



Merged-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Approved-by: Jack Chapman <jachapman@gitlab.com>
Approved-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Co-authored-by: Olivier Gonzalez <ogonzalez@gitlab.com>

Allow vulnerability management policy in update policy mutation

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



Merged-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Approved-by: Michał Zając <mzajac@gitlab.com>
Approved-by: Sashi Kumar Kumaresan <skumar@gitlab.com>
Co-authored-by: Lorenz van Herwaarden <lvanherwaarden@gitlab.com>

Skip new branch name validation for some keypresses

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



Merged-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Approved-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Approved-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Reviewed-by: Justin Ho Tuan Duong <hduong@gitlab.com>
Co-authored-by: Chad Lavimoniere <clavimoniere@gitlab.com>

Whenever the user releases any key while the new branch name field is
focused on an issue, the branch name is re-validated, even if no change
was made to the value.

This MR excludes keyups for certain key combinations so that copying the
branch name, using the arrow keys and hitting escape do not trigger
unnecessary validations.

Changelog: fixed

REST API - Edit and rewrap authentication content

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



Merged-by: Suzanne Selhorn <sselhorn@gitlab.com>
Co-authored-by: Russell Dickenson <rdickenson@gitlab.com>

update git clone for gitlab.vim to https

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



Merged-by: Amy Qualls <aqualls@gitlab.com>
Approved-by: Erran Carey <ecarey@gitlab.com>
Approved-by: Amy Qualls <aqualls@gitlab.com>
Co-authored-by: Tanner Wride <twride@gitlab.com>

Update dependency dompurify to ^3.1.7

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



Merged-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Approved-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Co-authored-by: GitLab Renovate Bot <gitlab-bot@gitlab.com>

docs: Clarifications regarding BYOK on Dedicated

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



Merged-by: Lysanne Pinto <lpinto@gitlab.com>
Approved-by: Lysanne Pinto <lpinto@gitlab.com>
Co-authored-by: Craig Miskell <cmiskell@gitlab.com>

Captures a few details that had to be explained in https://gitlab.com/gitlab-com/gl-infra/gitlab-dedicated/team/-/issues/6305

Merge branch '431048-do-not-show-zero-size-of-container-registry-manifest-lists-indexes-in-the-ui' into 'master' 

Show manifest media type for container registry image tag

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



Merged-by: Payton Burdette <pburdette@gitlab.com>
Approved-by: João Pereira <jpereira@gitlab.com>
Approved-by: Doug Stull <dstull@gitlab.com>
Approved-by: Payton Burdette <pburdette@gitlab.com>
Co-authored-by: Rahul Chanila <rchanila@gitlab.com>

Add StartAndDueDate EE service callbacks to roll up dates

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



Merged-by: Kassio Borges <kborges@gitlab.com>
Approved-by: Nicolas Dular <ndular@gitlab.com>
Reviewed-by: Kassio Borges <kborges@gitlab.com>
Reviewed-by: Tiger Watson <twatson@gitlab.com>
Reviewed-by: Nicolas Dular <ndular@gitlab.com>
Co-authored-by: Kassio Borges <kassioborgesm@gmail.com>

On https://gitlab.com/gitlab-org/gitlab/-/work_items/486526 we create
the StartAndDueDate EE widget extension and expose its fields on
GraphQL.

Now, we need to use the is_fixed field to choose between fixed and
rolled up dates while creating/updating an WorkItem. For that, we'll
need an EE extension of the StartAndDueDate service callback.

Related to: https://gitlab.com/gitlab-org/gitlab/-/work_items/493354
EE: true

Add gridstack dashboard helpers to gitlab storybook

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



Merged-by: Robert Hunt <rhunt@gitlab.com>
Approved-by: Robert Hunt <rhunt@gitlab.com>
Reviewed-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Reviewed-by: Jiaan Louw <3468028-jiaan@users.noreply.gitlab.com>
Reviewed-by: Robert Hunt <rhunt@gitlab.com>
Co-authored-by: Ezekiel Kigbo <ekigbo@gitlab.com>

Adds helpers for rendering gridstack dashboards as
storybook stories for prototyping new dashboards
or visualizations.

SSO folder: rename images to include milestone info

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



Merged-by: Jon Glassman <jglassman@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Amy Qualls <aqualls@gitlab.com>

Add changes to use work_item in epic

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



Merged-by: Terri Chu <tchu@gitlab.com>
Approved-by: Vamsi Vempati <vvempati@gitlab.com>
Approved-by: Tomas Bulva <tbulva@gitlab.com>
Approved-by: Dmitry Gruzd <dgruzd@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Reviewed-by: Terri Chu <tchu@gitlab.com>
Reviewed-by: Vamsi Vempati <vvempati@gitlab.com>
Co-authored-by: Siddharth Dungarwal <sdungarwal@gitlab.com>

Co-authored-by: DANGER_GITLAB_API_TOKEN <project_278964_bot_445da1b60fc7336b6b6776383134d10f@noreply.gitlab.com>

REST API - edit intro topic and create troubleshooting topic

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



Merged-by: Suzanne Selhorn <sselhorn@gitlab.com>
Co-authored-by: Russell Dickenson <rdickenson@gitlab.com>

Remove duplicate ci status

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



Merged-by: Pedro Pombeiro <noreply@pedro.pombei.ro>
Approved-by: Vanessa Otto <votto@gitlab.com>
Approved-by: Phil Hughes <me@iamphill.com>
Approved-by: Pedro Pombeiro <noreply@pedro.pombei.ro>
Co-authored-by: Payton Burdette <pburdette@gitlab.com>