# Conflicts:
#   app/models/ci/job_artifact.rb
#   app/uploaders/file_uploader.rb

[EE port] 26388 push to create a new project

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

Resolve "gitlab-rake gitlab:geo:check doesn't work"

Closes #4820

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

Migrate uploads rake task

Closes #4704

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

# 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