# Conflicts:
#	lib/gitlab/git/gitlab_projects.rb

[ci skip]

CE upstream - 2018-03-13 15:27 UTC

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

Upgrade GitLab Pages to v0.7.1

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

Resolve "gitlab:geo:check should check connections to the Geo tracking DB"

Closes #4849

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

Fix markdown table showing extra fake column v1

Closes #44024

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

fix timescale prometheus charts overlapping

Closes #43458

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

Specify installation type for link

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

Resolve "lib/gitlab/git/gitlab_projects.rb does not respect Gitlab.config.git.bin_path"

Closes #44161

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

Respect the configured git path for imported gitlab-shell operations (EE)

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

Add silent flag to curl in public IP lookup

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

Resolve "Geo: Don't attempt to expire the cache after a failed clone"

Closes #5197

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

# Conflicts:
#	config/routes/project.rb
#	locale/gitlab.pot

[ci skip]

skeleton loading for diff comments

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

Resolve "List Gitaly calls and arguments in the performance bar"

Closes #43805

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

Add frontend security documentation

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

Make commit pipeline accessible on file page

Closes #44152

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

This is as important as SQL timings, and much more important most of the time
than GC, Redis, or Sidekiq.

The same as the SQL queries, show the details of Gitaly calls in the performance
bar, as a modal that can be opened in the same way.

CE upstream - 2018-03-12 18:25 UTC

Closes #5204 and #5217

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

Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)"

Closes #35475

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

Resolve "Document webpack_bundle_tag replacement method"

Closes #43720 and #42704

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

Resolve "Wrong button has the loading state when submitting a comment in issues"

Closes #44149

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

Reduce noise from Chatops output

Closes #5140

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

* master: (29 commits)
  Fix provider server URL used when listing repos to import
  Fix inconsistent punctuation on MR form
  Update dependency for svgs
  Fix timestamp to include %M instead of %I for post-deploy migrations.
  Use Gitaly 0.89.0
  Resolve "Hover style for sidebar dropdowns is wrong"
  fixed spec
  Respect the protocol in `expose_url`
  Fix removes source branch text being rendered in merged state
  Fix code and wiki search results when filename is non-ASCII
  Include the ee/ directory in backtraces
  Use GitLab fork of zaproxy
  Updates file extensions on Vue docs
  fixed note polling not sending updated last fetched at date added spec for polling
  Add changelog entry
  Use `list.id` for `:key`
  added mutation spec
  Bump parser and unparser gems to remove warnings
  fix polling not working correctly
  Fixed issue notes being duplicated
  ...