Update some Gitaly annotations in Gitlab::Shell

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

Modify `LDAP::Person` to return username value based on attributes

Closes #39691

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

Resolve "Master failure due to static-analysis job in app/models/concerns/deployment_platform.rb"

Closes #41695

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

Merge branch '41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handler' into 'master'

Resolve "Branch name omitted due to bad UTF-8 conversion by Gitaly ref handler"

Closes #41677

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

Resolve "Broken master due to `static-analysis`"

Closes #41685

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

`Gitlab::LDAP::Person` did not respect the LDAP attributes username
configuration and would simply return the uid value. There are
cases where users would like to specify a different username field
to allow more friendly GitLab usernames. For example, it's common
in AD to have sAMAccountName be an employee ID like `A12345` while
the local part of the email address is more human-friendly.

Create Kubernetes based on Application Templates

Closes #41056

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

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

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

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