Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298

Conflicts:
	app/models/merge_request.rb
	spec/models/merge_request_spec.rb

Fix for Follow-up from "Backport of Multiple Assignees feature

Closes #31888

See merge request !11178

Resolve "Follow-up from "Backport of Multiple Assignees feature""

See merge request !11185

Issue API change: assignee_id parameter and assignee object in a response

See merge request !11271

Kubernetes Helm Chart Install docs

See merge request !11139

Fix typo

See merge request !11361

Add guide to collaborate with i18n.

See merge request !11196

Update documentation on reserved words for groups and projects

See merge request !11432

Refactor pipeline schedules docs

See merge request !11470

Fix 9.2 conflicts for "MR zindex regression"

See merge request !11487

Fix 9.2 conflicts for "Ensure schedule_form and schedules_index both utilize common_vue bundle"

See merge request !11488

Uniform CI status components in vue

Closes #30286

See merge request !11235

MRWidget: Fix target branch link.

See merge request !11267

Fix ability to edit diff notes multiple times

Closes #32425

See merge request !11456

Fix linking to resolved note in diff

Closes #32125

See merge request !11327

Fix flickering of system notes

Closes #32087

See merge request !11281

Fix cross referencing for private and internal projects

Closes #31978

See merge request !11243

Fix reassigned MR HTML email

See merge request !11238

Fix note flicker with note you can't edit and trailing new line edge case

Closes #32449

See merge request !11472

Fix: Deleting an invited member causes 500 error

Closes #32504

See merge request !11481

Fixes for the rename reserved paths helpers

Closes #32528

See merge request !11492

Fix clicking disabled clipboard button toolip

Closes #32518

See merge request !11493

Catch all URI errors in ExternalLinkFilter

Closes #32076

See merge request !11494

Fix ProjectCacheWorker for plain READMEs

Closes #32540

See merge request !11506

Wait for requests after each Spinach scenario instead of feature

See merge request !11349

Re-enable gitaly migration for ref_name_for_sha after bugfixes

See merge request !11310

Stop MR conflict code from blowing up when branches are missing (9.2)

See merge request !11502

Fix 9.2 conflicts for "prevent dropdowns from being cut-off by scrollable tab container"

See merge request !11486

Initial render of issue title & description

See merge request !11491

prevent dropdowns from being cut-off by scrollable tab container

Closes #32328 and #32326

See merge request !11399

Conflicts:
	app/assets/stylesheets/framework/nav.scss

Fix root groups redirecting to group owner

Closes #32474

See merge request !11465

Gitaly reuse stubs

See merge request !11469

Ensure vue_merge_request_widget utilizes common_vue bundle

See merge request !11269

Ensure schedule_form and schedules_index both utilize common_vue bundle

See merge request !11274