CE upstream - 2018-03-20 06:23 UTC

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

Ee move render gfm

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

Move render gfm to commons and update imports

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

CE upstream - 2018-03-19 21:23 UTC

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

Show Ajax requests in performance bar

Closes #43925

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

# Conflicts:
#	Gemfile
#	Gemfile.lock
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/user/project/integrations/prometheus.md
#	lib/api/search.rb

[ci skip]

[Rails5] Update active_record_locking initializer

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

Optional '/-/' delimiter for search API

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

Improvements for prometheus metrics documentation

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

Add documentation for custom metrics

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

Add Cluster Monitoring Documentation

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

[EE] Optional '/-/' delimiter for epics and search API

Closes #5245

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

Ignore unsubscribed toggle for @ mentions

Closes #43933

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

Clean up selectors in framework/header.scss

Closes #44383

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

But first, rewrite the performance bar in Vue:

1. Remove the peek-host gem and replace it with existing code. This also allows
   us to include the host in the JSON response, rather than in the page HTML.
2. Leave the line profiler parts as here-be-dragons: nicer would be a separate
   endpoint for these, so we could use them on Ajax requests too.
3. The performance bar is too fiddly to rewrite right now, so apply the same
   logic to that.

Then, add features! All requests made through Axios are able to be tracked. To
keep a lid on memory usage, only the first two requests for a given URL are
tracked, though. Each request that's tracked has the same data as the initial
page load, with the exception of the performance bar and the line profiler, as
explained above.

'/-/' delimiter is used only in UI, in API we don't use it for
other endpoints. To align search endpoints with the rest of API
endpoints, this patch makes '/-/' optional for existing endpoints (to
keep backward compatibility).

Documentation is updated to prefer paths without '/-/'.

'/-/' delimiter is used only in UI, in API we don't use it for
other endpoints. To align epics and search endpoints with the rest of API
endpoints, this patch makes '/-/' optional for existing endpoints (to
keep backward compatibility), for new endpoints (epic notes, discussions)
'/-/' path is not included.

Documentation is updated to prefer paths without '/-/'.

Closes #5245

CE upstream - 2018-03-19 15:28 UTC

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

Resolve "Add documentation for "Display ingress IP address in the Kubernetes page""

Closes #44330, #42761, and #43526

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

Update google-api-client 0.13.6 -. 0.19.8

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

Unify format for nested non-task lists

Closes #44384

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

Fix Geo docs for 10.6

Closes #5259, #5264, and #5265

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

Issue Boards: Ensure that horizontal scroll bars are shown on overflow

Closes #2680

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