[ci skip]

[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

# Conflicts:
#	Gemfile.lock
#	app/helpers/branches_helper.rb
#	app/services/projects/update_pages_service.rb
#	app/views/projects/branches/index.html.haml
#	config/prometheus/additional_metrics.yml
#	db/schema.rb
#	doc/user/project/integrations/prometheus_library/kubernetes.md

[ci skip]

CE upstream - 2018-03-06 00:34 UTC

Closes gitaly#1054 et gitaly#1048

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

Move external files support from Premium to Starter

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

Fix Gitaly n+1 in NetworkController#show

Closes #37602 and gitaly#1056

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

Port to EE: Reload stable object to prevent erase artifacts with old state

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

Add overview of branches and filtered views for active/stale branches

Closes #40187 et #17293

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

* ee/master:
  Add project export API
  Lock gRPC gem to 1.8
  Add spec
  Fix http_io to make it return path is nil
  Add find-sec-bugs in the list of tools for java SAST. Refs #4123
  Changes after review
  Fix broken empty tab state
  Manage empty states in Pipelines page Adds i18n Adds test
  Merge from CE

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

Lock gRPC gem to 1.8

Closes gitaly#1059

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

Reload stable object to prevent erase artifacts with old state (Ver 2)

Closes #43641

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

Add project export API

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

Lock gRPC gem to 1.8

Closes gitaly#1059

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

Add find-sec-bugs in the list of tools for java SAST

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

perforce.md: add note about repacking

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

Resolve "Group Leave action is broken on Groups Dashboard and Homepage"

Closes #43299

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

Improve GitLab Kubernetes CPU metrics

Closes #43670 and #43462

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

Update Kubernetes CPU/Memory Prometheus queries

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

Fix http_io to make it return path is nil

Closes #5119

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

Fix race condition when previewing docs

Closes gitlab-com/gitlab-docs#154 et #41024

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

Fix a changelog entry YAML to be consistent with EE

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

Given 1.9 has issues we're aware of, for now we're locking to 1.8.
Closes gitlab-org/gitaly#1059 and will probably be removed if 1.10 is
tested an deemed ok.

Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15860