# Conflicts:
#	app/models/ci/job_artifact.rb
#	app/views/layouts/nav/sidebar/_group.html.haml
#	app/views/projects/clusters/index.html.haml
#	app/workers/build_finished_worker.rb
#	lib/api/users.rb
#	locale/gitlab.pot
#	spec/javascripts/clusters/clusters_bundle_spec.js
#	spec/models/ci/job_artifact_spec.rb
#	spec/models/project_services/kubernetes_service_spec.rb
#	spec/requests/api/jobs_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb

[ci skip]

Resolve "spec/ee/spec/services/ee/projects/destroy_service_spec.rb is failing"

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

CE upstream - 2018-02-06 09:41 UTC

Closes gitlab-qa#175, #4803, and gitaly#991

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

Resolve "ProjectCacheWorker leaks file descriptors"

Closes #42730

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

Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>

Refactor Gitlab::Git code related to LFS changes for Gitaly migration

Closes gitaly#980

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

Downgrade google-protobuf

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

Add sorting options for /users API

Closes #42669

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

Signed-off-by: Bastian Blank <waldi@debian.org>

moved migration to correct place in ee folder

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

File upload UI obeys LFS filter

Closes #29876

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

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

Replace "cluster" with "Kubernetes cluster" (EE port)

Closes gitlab-ce#41963

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

# Conflicts:
#   Gemfile
#   Gemfile.lock

Adds Rack Attack disabled by default notice to the docs

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

Replace "cluster" with "Kubernetes cluster"

Closes #41963

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

Upgrade GitLab Workhorse to v3.6.0

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

Support SendURL for performing indirect download of artifacts if clients does…

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

Uses Lfs::FileModificationHandler to coordinate LFS detection, creation of LfsObject, etc

Caveats:
 1. This isn't used by the multi-file editor / Web IDE
 2. This isn't used on rename. We'd need to be able to download LFS files
    and add them to the commit if they no longer match so not as simple.
 3. We only check the root .gitattributes file, so this should be improved
    to correctly check for nested .gitattributes files in subfolders.

Uploads should delete files when destroyed

Closes #14256

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

Merge branch '42693-add-a-link-to-documentation-on-how-to-get-external-ip-in-the-kubernetes-cluster-details-page' into 'master'

Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page"

Closes #42693

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

Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page"

Support SendURL for performing indirect download of artifacts if clients does not specify that it supports that

Use Workhorse 3.6.0 as this is the first version that implements send-url:.

EE: Trace as artifacts (FileStorage and ObjectStorage)

Closes #4171

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

CE: Trace as artifacts (FileStorage only)

Closes gitlab-ee#4180

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Port 16799 to EE

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