* 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