CE upstream - 2018-01-27 03:25 UTC

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

# Conflicts:
#	app/views/help/index.html.haml

[ci skip]

Generalize toggle_buttons for JavaScript usage -- EE merge edition

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

Generalize toggle_buttons for JavaScript usage

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

Port of cs-fix-commercial-content-check to EE.

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

Fix spec failures in issues_spec.rb

Closes #42488

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

Include the GitLab version info when commercial content on help page is disabled

Closes #42486

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

Fix cancelling of board settings modal

Closes #4565

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

CE upstream - 2018-01-26 18:23 UTC

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

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master'

Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)."

Closes #42327

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

Minor update of Geo database doc

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

CE upstream - 2018-01-26 12:23 UTC

Closes #4698

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

Geo: Don't attempt to schedule a repository sync for downed Gitaly shards

Closes #4329

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

Add docs about refreshing the FDW tables

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

Merge branch 'ce-to-ee-2018-01-26' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee-2018-01-26

* 'ce-to-ee-2018-01-26' of https://gitlab.com/gitlab-org/gitlab-ee:
  Resolve conflict in mr_widget_merge_when_pipeline_succeeds.vue

Resolve "Multi-file editor commit panel empty state"

Closes #4573

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
#	config/gitlab.yml.example
#	config/initializers/0_post_deployment_migrations.rb

[ci skip]

Moves components into vue files:

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

Moves components into vue files:

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