Merge branch '44740-api-to-verify-a-given-user-has-right-to-merge-a-given-mergerequest' into 'master'

API: Expose if the user can merge a given merge request

Closes #44740

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

Simplify bin/secpick git commands

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

Reduce remaining diff with EE in app/services

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

Fix suggested changes syntax highlighting

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

Removed the `note-text` class since it conflicted other classes.

Add more feature specs for group labels

Closes #25381

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Optimize Redis usage in User::ActivityService

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

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

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

Add a scope to preload emails on a user

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

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

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

Avoid checking Redis when User#last_activity_on is already up to date.

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

Fix callback url

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

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

Rewrite GitLab Flow doc

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

Merge branch '57634-issue-when-viewing-a-document-with-footnotes-actionview-template-error-undefined-method-at_css-for-nil-nilclass' into 'master'

Issue when viewing a document with footnotes

Closes #57634

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

[Docs] Improve the Review Apps documentation

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

Fix polling for transformed individual notes

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

Fix Content-Disposition hard-coded to attachments

Closes #57660

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

EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9530

Due to a regression in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24919,
Content-Disposition is hard-coded to `attachment` instead of `inline`.
We now use the argument `disposition` to fix that problem.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57660

Reviewer roulette via Danger

Closes #56087

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

Resolve "Merge Request Tabs Header is missing bottom border"

Closes #57160

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