Backport merge_params.html.haml conflict comment

See merge request !12138

Instrument MergeRequestDiff#load_commits

See merge request !12162

Don't return nil for missing objects from parser cache

See merge request !12168

Fix note highlight being lost after real time update

Closes #33483

See merge request !12098

Fix milestone page assignees when dropped in ongoing list

Closes #32861

See merge request !12076

Update /target_branch slash command description to be more consistent

See merge request !12175

Require rubocop-rspec in the correct location

See merge request !12174

Resolves the `codeclimate` CI failure

Fix autocomplete not working on note edit form

Closes #33529

See merge request !12106

Fixed pipelines Vue template not ending correctly

See merge request !12170

Move remove token of Select2 to the right

See merge request !12101

Add a custom RSpec/SingleLineHook cop

Closes #24891

See merge request !11911

This cop adds an offense when `before`, `after`, or `around` are used as
single-line blocks.

Fix fenced code block misalignment in events/activity

Closes #31263

See merge request !12149

Add codeclimate job to .gitlab-ci.yml

See merge request !12086

more visual contrast for active page in pagination widget

Closes #32470

See merge request !12119

Allow more customization to Help landing page

See merge request !11878

Implement diff viewers

Closes #30501 and #19931

See merge request !11777

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33529

Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11278

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32861

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33483

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

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

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

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

Backport EE changes to the Kubernetes service

Closes gitlab-ee#2525

See merge request !12139

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

Closes #33149

See merge request !11941

Raise etag route regex miss

Closes #33106

See merge request !12084

Move vue components to vue files and match docs

See merge request !12146