* upstream/master: (671 commits)
  Make rubocop happy
  Use guard clause
  Improve language
  Prettify
  Use temp branch
  Pass info about who started the job and which job triggered it
  Docs: add indexes for monitoring and performance monitoring
  clearer-documentation-on-inline-diffs
  Add docs for commit diff discussion in merge requests
  sorting for tags api
  Clear BatchLoader after each spec to prevent holding onto records longer than necessary
  Include project in BatchLoader key to prevent returning blobs for the wrong project
  moved lfs_blob_ids method into ExtractsPath module
  Converted JS modules into exported modules
  spec fixes
  Bump gitlab-shell version to 5.10.3
  Clear caches before updating MR diffs
  Use new Ruby version 2.4 in GitLab QA images
  moved lfs blob fetch from extractspath file
  Update GitLab QA dependencies
  ...

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

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

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.

Make mail notifications of discussion notes In-Reply-To of each other

Closes #36054

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

Use author info on commits list page rather than most recent commit date

Closes #25317

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

The hook ordering influenced the diffs being generated as these used
values from before the update due to the memoization still being in
place. This commit reorders them and tests against this behaviour.

Use a dedicated queue for each Sidekiq worker

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