* 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

* upstream/master: (55 commits)
  Refactor broadcast_message.js
  Add create merge checkbox.
  Revert "Merge branch '36160-select2-dropdown' into 'master'"
  Update licenses
  fix a wrong method call in the refactor
  fix a whitespace
  fix for discussion
  Update templates via:
  Update doc accordingly to:
  Cache issuable template names
  Fix the format of rugged alternate directory list
  Match full file path in FileDetector
  Fixes from CSS refactor
  Resolve "Prometheus service page shows error"
  Remove members and memberExpirationDate from window object
  Explicit state integration deletion
  Move all API authentication code to APIGuard
  Shorten example translation for inclusive language
  [ci-skip] add changelog
  fix the merger override to remove source branch
  ...

Geo: Properly check return value of file download return codes

Closes #3749

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

Refactor broadcast_message.js

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

ff-rebase-docs

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

Removes Members, memberExpiration from window object

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

Fix reading the status of a secondary Geo node from the primary

Closes #3742

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

Revert "Merge branch '36160-select2-dropdown' into 'master'"

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

CE upstream - Wednesday

Closes gitlab-com/support-forum#2476

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