# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/finders/issuable_finder.rb
#	app/policies/base_policy.rb
#	app/policies/merge_request_policy.rb
#	app/views/layouts/nav/sidebar/_group.html.haml
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-02-23 00:25 UTC

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

Allow token authentication on go-get request

Closes #42817

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

Optimize number of queries for approvals

Closes #4903

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

Keep "Import project" tab/form active when validation fails trying to import  "Repo by URL"

Closes #43261

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

External authorization service

Closes #4216

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

Port `read_cross_project` ability from EE

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

Add Tip about Push to Create project on New Project page

Closes #42938

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

Add a button on the project page to set up a Kubernetes cluster and enable Auto DevOps -- EE merge edition

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

Enable "Legacy Authorization" by default when creating a Cluster on GCP

Closes #41619

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

Add a button on the project page to set up a Kubernetes cluster and enable  Auto DevOps

Closes #42431

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

CE upstream - 2018-02-22 18:24 UTC

Closes #4998

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

Remove bundle tag for ui help

Closes #41341

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

Add license ID number to usage ping

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

GKE 1.8 has RBAC on by default, since GKE has bumped the default version
to 1.8.7 RBAC is now on, and we don't support that out of the box.

This was also avoiding cluster applications (tiller, prometheus, etc), to
be installed.

Closes #41619

Remove ee dynamic imports

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

Resolve "cache key for CI stopped working"

Closes #43373

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

[ci skip]

[ci skip]

[ci skip]

# Conflicts:
#   app/assets/javascripts/dispatcher.js
#   doc/user/project/milestones/index.md

Use dynamic imports in dispatcher (Part 3) (EE)

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

Burndown chart docs update

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

# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/uploaders/personal_file_uploader.rb
#	doc/user/project/milestones/index.md

[ci skip]

When this feature is enabled, users will not be able to see any cross
project references.

When a user tries to view a project we will first validate if the user
has access to the classification label assigned to the project.

When no classification label is assigned to a project, a default label
is used. This default can be defined in the settings.

This ability can be disabled when an external authorization service is
enabled.