CE upstream: Friday

Closes gitaly#586, gitlab-ce#38871, and gitaly#629

See merge request gitlab-org/gitlab-ee!3144

Make the maximum capacity of Geo backfill operations configurable

Closes #3532

See merge request gitlab-org/gitlab-ee!3107

* ee/master:
  Port of fl-autodevops-fix to EE
  Port Git alternate dirs fix to EE
  Fix default crontab for Geo::FileDownloadDispatchWorker
  Allow the default branch as branch name
  Geo: Don't sync disabled project wikis

Geo: Don't sync disabled project wikis

Closes #3569

See merge request gitlab-org/gitlab-ee!3109

Port of fl-autodevops-fix to EE

See merge request gitlab-org/gitlab-ee!3145

Allow the default branch as branch name

Closes #3670

See merge request gitlab-org/gitlab-ee!3154

Port Git alternate dirs fix to EE

See merge request gitlab-org/gitlab-ee!3157

Fix default crontab for Geo::FileDownloadDispatchWorker

Closes #3771

See merge request gitlab-org/gitlab-ee!3155

* ee/master:
  Linter fixes
  Test PostgreSQL 9.6 and postgres_fdw with Geo specs
  Move line code generation into Gitlab::Git
  Create a Gitlab::Git submodule for conlict-related files
  Refactor conflict resolution to contain git ops within Gitlab::Git
  Clean hierarchy of calls between models and Gitalb::Git for blob search
  Move Gitlab::Diff::LineCode to module Gitlab::Git
  Encapsulate git operations for conflict resolution into lib
  Popen with a timeout
  EE version of ph-shortcut-js-modules
  Memoize migration files per migrations paths
  Remove duplicated sections
  Remove +x permission from app/assets/images/favicon-green.ico
  added date parameter for time tracking
  add spec for projects
  tests for sidebar labels
  fix creating labels from Group Boards sidebar

Popen with a timeout

See merge request gitlab-org/gitlab-ee!3149

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14528

And in EE we're extending it with: `find_user_by_job_token`

[EE] Conflict resolution refactor

See merge request gitlab-org/gitlab-ee!3150

Remove duplicated sections

See merge request gitlab-org/gitlab-ee!3146

Test PostgreSQL 9.6 and postgres_fdw with Geo specs

See merge request gitlab-org/gitlab-ee!3136

Having a distinct class just for that was a bit overkill

Rename classes to (hopefully) clearer names while we're doing that.

This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553

EE version of ph-shortcut-js-modules

See merge request gitlab-org/gitlab-ee!3148

Memoize migration files per migrations paths

Closes #3701

See merge request gitlab-org/gitlab-ee!3147

Added possibility to enter past date in /spend command to log time in the past

See merge request gitlab-org/gitlab-ee!3044

Because the Geo tracking database uses different migration paths,
memoize the migration files per set of `paths`.

Closes gitlab-org/gitlab-ee#3701.

fix creating labels from Group Boards sidebar

Closes #3369

See merge request gitlab-org/gitlab-ee!2869

Remove +x permission from app/assets/images/favicon-green.ico

See merge request gitlab-org/gitlab-ee!3138

# Conflicts:
#   spec/features/boards/sidebar_spec.rb