Simplify conflict resolver interface

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

Docs update documentation guidelines

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

fix button alignment on MWPS component

Closes #38541

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

Import gitlab-shell gitlab_projects.rb as at v5.10.2

Closes #41016

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

Add eager-load paths to autoload paths to fix Rake tasks

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

Added LFS badge to indicate LFS tracked files

Closes #15567

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

Pass info regarding the user and job that initiated a trigger

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

This does two things:
- Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the
former.
- Depend on only the target repository for conflict listing. For
conflict resolution, treat one repository as a remote one so that we can
implement it as such in Gitaly.

Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly

Closes gitaly#808

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

Docs: add indexes for monitoring and performance monitoring

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

clearer-documentation-on-inline-diffs

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

Add commit diff discussion in merge request context documentation

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

Update flipper to 0.11.0 and take advantage of the new features

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

Converted JS files into exported modules

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

By importing this Ruby code into gitlab-rails (and gitaly-ruby), we avoid
200ms of startup time for each gitlab_projects subprocess we are eliminating.

By not having a gitlab_projects subprocess between gitlab-rails / sidekiq and
any git subprocesses (e.g. for fork_project, fetch_remote, etc, calls), we can
also manage these git processes more cleanly, and avoid sending SIGKILL to them

Rake doesn't respect eager-loading, so to avoid explicit requires we have to
duplicate the eager-load config into the auto-load config.

This backports an EE change made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3706

Fixed doc for create MR from email

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

Include project in BatchLoader key to prevent returning blobs for the wrong project

Closes gitlab-ee#4325

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

sorting for tags api

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

Clear caches before updating MR diffs

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

Dependencies Validator fails when depended job is `manual`

Closes #41110

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

Update GitLab QA dependencies

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

Bump gitlab-shell version to 5.10.3

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

gitlab-shell 5.10.3 does not introduce any new features; it just removes an
unused config option.