In https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3648,
support for listing conflicts even when there's a missing side has
been added to ListConflictFiles RPC. This only happens when
`allow_tree_conflicts` is set to `true` in the RPC request.

This allows gitlab-rails to use that parameter when displaying
MR diffs with conflicts. The `allow_tree_conflicts` will be set
to `true` only when `display_merge_conflicts_in_diff` is enabled.
Otherwise, it'll be set to `false`.

Remove unnecessary yarn resolution

See merge request gitlab-org/gitlab!66455

Add security scanners column into

See merge request gitlab-org/gitlab!66114

Clarify RPC concurrency limit details

See merge request gitlab-org/gitlab!65388

Default on GraphQL boards feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63118

Re-schedule `latest_pipeline_id` population with logger

See merge request gitlab-org/gitlab!66050

Add authentication note to releases API

See merge request gitlab-org/gitlab!66499

Refine moderate users content

See merge request gitlab-org/gitlab!66417

approval_project_rules table. nil
is supported for existing records.

Changelog: added

Fix audit events empty space

See merge request gitlab-org/gitlab!52590

Restrict omnibus self-managed registry test to pipeline main

See merge request gitlab-org/gitlab!66350

Update background migration to use main instead of master [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!66492

https://gitlab.com/gitlab-org/gitaly/-/merge_requests/3537 updated the
default branch to be `master` instead of `main`. This broke
`backfill_snippet_repositories_spec.rb` because it expected to create
commits in `master`, but the default branch was `main`.

Since `main` is now the default, we should target the initial commit for
that branch.

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/336538

Fix CRON setting when using gitaly-backup

See merge request gitlab-org/gitlab!65695

Create Form for Issue and Epic in Boards

See merge request gitlab-org/gitlab!65048

Allow updating merged results pipelines and merge trains via API [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!56237

Move API CI related classes under Ci namespace

See merge request gitlab-org/gitlab!66263

Add SAML provider search to UsersFinder

See merge request gitlab-org/gitlab!66162

Remove helm doc warnings

See merge request gitlab-org/gitlab!66484

Add details about project feature settings

See merge request gitlab-org/gitlab!54276

Update GitLab Runner Helm Chart to 0.31.0/14.1.0

See merge request gitlab-org/gitlab!66447

Fix line numbers not being calculated properly

See merge request gitlab-org/gitlab!66475

Add project-level VSA for deploy metrics

See merge request gitlab-org/gitlab!65378

Resolve "Evaluate master/main usage and resolve issues - Package"

See merge request gitlab-org/gitlab!66469

Document wiki default branch behavior

See merge request gitlab-org/gitlab!66404

Remove marketing email opt-in for self-managed

See merge request gitlab-org/gitlab!66255

Clean up data-testid and use findByRole

See merge request gitlab-org/gitlab!66379

Add a note about sub group data

See merge request gitlab-org/gitlab!65365