* master: (200 commits)
  Fix issue boards scroll config.
  Added multi editor setting on the profile preferences page
  fix missing import of timeWeek which would cause errors in prometheus graphs with deployments
  Remove downcase from special path helper
  Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql}
  Fix error when viewing diffs without blobs
  Moves prettier to dev dependency
  Eager load event target authors whenever possible
  Do not run ee_compat_check on security branches
  Include integration tests in CE/EE testing documentation
  41054-Disallow creation of new Kubernetes integrations
  Resolve "Resizable file list and commit panel"
  Make tooltip placement bottom by default as per design guidelines
  Fix groups list icon, timestamp alignment and row height
  Avoid leaving a push event empty if payload cannot be created
  Move git operations for UpdateRemoteMirrorService into Gitlab::Git
  Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
  Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository
  Update Kubernetes service documentation
  fix issue #37843
  ...

Scroll to top/bottom in issue board when reach to edges

Closes #39709

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

Fix missing d3 timeWeek import in prometheus graph

Closes #41644

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

Added multi editor setting on the profile preferences page

Closes #41272

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

Do not run ee_compat_check on security branches

Closes #41396

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

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

Moves prettier to dev dependency

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

Remove downcase from special path helper

Closes #41590

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

Eager load event target authors whenever possible

Closes #41618

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

Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql}

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

Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass' into 'master'

Resolve "Error 500 trying to view a merge request JSON: undefined method `binary?' for nil:NilClass"

Closes #41468

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

Update Kubernetes service documentation

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

CE: Unify CE and EE tests in spec/controllers/projects/artifacts_controller_spec.rb

Closes gitlab-ee#3377

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

Enable our own custom cops, again?

Closes #41480

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

[CE] Move git operations for UpdateRemoteMirrorService into Gitlab::Git

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

Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background migration

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

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

Old merge requests can have diffs without corresponding blobs. (This also may be
possible for commit diffs in corrupt repositories.)

We can't use the `&.` operator on the blobs, because the blob objects are never
nil, but `BatchLoader` instances that delegate to `Blob`. We can't use
`Object#try`, because `Blob` doesn't inherit from `Object`.

`BatchLoader` provides a `__sync` method that returns the delegated object, but
using `itself` also works because it's forwarded, and will work for
non-`BatchLoader` instances too. So the simplest solution is to just use that
with the `&.` operator.

Groups tree enhancements

Closes #40533

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

This ensures that the "author" association of an event's "target"
association is eager loaded whenever the "target" association defines an
"author" association. This in turn solves the N+1 query problem we first
tried to solve in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 but caused
problems when displaying milestones as those don't define an "author"
association.

The approach in this commit does mean that the authors are _always_
eager loaded since this takes place in the "belongs_to" block. This
however shouldn't pose too much of a problem, and as far as I can tell
there's no real way around this unfortunately.

Branches started from `security-X-Y` will likely fail on `ee_compat_check`,
the check tries to merge against EE `master` which may likely fail for MR that
are not targetted on `master`, like security fixes.

This commit disables `ee_compat_check` on branches starting with `security-`.

Avoid leaving a push event empty if payload cannot be created

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

Handle Gitaly aborted merge due to branch update

Closes gitaly#854

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

Include integration tests in CE/EE testing documentation

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

Add support for max_count option to Git::Repository#count_commits

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

Use a background migration for migrating issues.closed_at

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

Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json

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

41054-Disallow creation of new Kubernetes integrations

Closes #41054

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

Resolve "Resizable file list and commit panel"

Closes #40042

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

Use heredoc for long strings so it's easier to read

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

Fix API endpoints to edit wiki pages where project belongs to a group

Closes #40453

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