see https://gitlab.com/gitlab-org/gitlab-ce/issues/40994

Expose GITLAB_FEATURES as CI/CD variable (fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40994)

CE upstream - 2018-02-12 17:52 UTC

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

FDW status of Geo secondaries in Geo Node screen

Closes #4297

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

Fixed missing js selector for the realtime pipelines commit component

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

Convert groups_select ajax to use axios

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

Convert groups_select ajax to use axios

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

Resolve "DR: document process for bring a demoted primary back online"

Closes #4211

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

CE upstream - 2018-02-12 15:25 UTC

Closes #4842

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

Make GITLAB_FEATURES in build_spec compatible with EE

Closes #40994

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

Create an empty wiki when there is no wiki in the gitlab export bundle

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

Fix breadcrumb on labels page for groups

Closes #42909

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

Replaced use of $.get with axios.get and updated tests

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

New Crowdin translations

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

Fix issue with Gitlab::CurrentSettings and autoload/spring system

Closes gitlab-ee#4842

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

Added change icon to file in IDE file list

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

CE upstream - 2018-02-12 12:22 UTC

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

Move IssuableTimeTracker vue component

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

CE upstream - 2018-02-12 09:39 UTC

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

Default CI variables to unprotected

Closes #42928

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

# Conflicts:
#	app/assets/stylesheets/framework.scss
#	lib/api/search.rb
#	spec/requests/api/search_spec.rb

[ci skip]

EE Port of "API - fix searching in group/project specified by path"

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

Update jquery.waitforimages & use npm version

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