Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Wrap the approvals required in a fallback rule

See merge request gitlab-org/gitlab-ee!9491

Mark group-level labels in Label API as such.

Closes #56694

See merge request gitlab-org/gitlab-ce!25219

CE Port of fix for roadmap forward timeline scroll

See merge request gitlab-org/gitlab-ce!25217

Resolve "Cannot scroll forwards in time for roadmap view"

Closes #9721

See merge request gitlab-org/gitlab-ee!9530

Add a scope to preload emails on a user

See merge request gitlab-org/gitlab-ce!25051

Create separate ApprovalMergeRequestRule for code owners

See merge request gitlab-org/gitlab-ee!9455

Revert "Merge branch '50559-add-milestone-progress-to-api' into 'master'"

See merge request gitlab-org/gitlab-ce!25229

Revert "Merge branch '9748-fix-boards-milestones-controller-spec' into 'master'"

See merge request gitlab-org/gitlab-ee!9546

Quarantine protected_tags_spec.rb spec

See merge request gitlab-org/gitlab-ee!9493

Fix resolvable status for replies to comments

See merge request gitlab-org/gitlab-ce!24950

Sets `updated_at` so that the transformed note is returned together with
the new reply

Resolve "Web IDE new directory dialog shows file templates"

Closes #57544

See merge request gitlab-org/gitlab-ce!25119

Resolve "Gitlab Project import fails: sidekiq undefined method import_jid"

Closes #57579

See merge request gitlab-org/gitlab-ce!25239

Fixed link alignment

See merge request gitlab-org/gitlab-ce!25162

Bugfix: scope vulnerability occurrences by Time not Date

See merge request gitlab-org/gitlab-ee!9494

Fix flaky test that can occur when rounding by Date instead of Time.
This can result in scoping failures when run on a computer with non-UTC
timezone

Fix callback url

See merge request gitlab-org/gitlab-ce!25195

This reverts merge request !9539

This reverts merge request !25173

[QA] Skip contexts in quarantine

See merge request gitlab-org/gitlab-ce!24942

This avoids running before/after blocks for tests that are in quarantine

Adding Feature Flags to Usage Ping

See merge request gitlab-org/gitlab-ee!9475

Rewrite GitLab Flow doc

See merge request gitlab-org/gitlab-ce!20951

Rewrite GitLab Flow doc

See merge request gitlab-org/gitlab-ee!6733

# Conflicts:
#	ee/spec/lib/gitlab/usage_data_spec.rb