Backport merge_params.html.haml conflict comment

See merge request !2120

EE: Fix raw_path with the new job path, rename builds to jobs in test

See merge request !2129

EE: Use the same way to invalidate cache from EE

See merge request !2134

[ci skip]

[ci skip]

Adding Benefit and Qualification sections to EE products

See merge request !2110

Fix transient error with filtered search lazy author/assignee tokens

Closes #2661

See merge request !2142

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2661

CE Upstream - Monday

Closes omnibus-gitlab#1714, gitlab-ce#32587, and gitlab-ce#32218

See merge request !2107

Service hostname also include registry name, when using non Docker Hub registry.

See merge request !11729

Fix file diff title and renames alignment in discussions

Closes #31782

See merge request !12169

Stop using deprecated `path` field on Gitaly messages

See merge request !12112

#13336 - display multiple messages in both the UI and git output

Closes #13336

See merge request !11113

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

Related issues FE Base

Closes #2001

See merge request !1797

Document a new migrations testing technique

Closes #33565

See merge request !12181

Add age color mapping to blame view

Closes #23998

See merge request !7198

Remove duplicate Project after_validation entry

See merge request !2133

Make spec/spec_helper consistent with EE by including a :routing type

See merge request !12178

Do not show manual actions that cannot be run

Closes #32380

See merge request !12121