# Conflicts:
#	db/schema.rb

[ci skip]

CE upstream - 2018-02-01 18:25 UTC

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

Fix Geo streaming check

Closes #4765

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

Fix an issue where sparse checkout wasn't configured correctly

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

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

Moves more mr widget components into vue files

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

Moves author components into vue files

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

Fix typo in gitlab_runner_chart.md

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

Web IDE Visual Polish 26.01

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

Finish any remaining jobs for issues.closed_at

Closes #41595

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

Improve issue note dropdown and mr button

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

QA::Page::Component::Dropzone#initialize needs a QA::Page::Base object

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

Ensure we save QA screenshots to an absolute path

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

[EE] QA::Page::Component::Dropzone#initialize needs a QA::Page::Base object

Closes gitlab-qa#173

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

Backport changes in the application settings helper to CE

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

Resolve "Geo selective sync by repository shard"

Closes #4644

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

Docs: update GitLab products description

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

This was affecting the performance of `Gitlab::Git::Repository#squash`.

Add confirmation input component

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

Docs: update GitLab products description

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

Migrate Gitlab::Git::Repository#write_config to Gitaly

Closes gitaly#970

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

# Conflicts:
#	app/assets/javascripts/pages/projects/tree/show/index.js
#	scripts/lint-rugged

[ci skip]

Hide pipeline schedule 'take ownership' for current owner

Closes #35285

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

* master: (38 commits)
  Added more tests and corrected typos
  Ban Rugged from Repository
  Improve doc/development/automatic_ce_ee_merge.md
  fixed infinite loop crashing tests
  Converted todos.js to axios
  Converted usage_ping.js to use axios
  Converted pager.js to axios
  Converted notifications_form.js to axios
  Converted notes.js to axios
  Converted branch_graph.js to axios
  Converted mini_pipeline_graph_dropdown.js to axios
  Include subgroup issuables on the group page
  Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock
  Replace $.ajax in find file with axios
  Replace $.ajax in activity calendar with axios
  Remove namespaced internationalization import
  Fix subgroup creation docs
  Fix a JSON schema that doesn't include enough fields
  Make user/author use project.creator in most factories
  Enable RuboCop Style/RegexpLiteral
  ...

Speed-up the gitlab_git_test job

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

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

More conversions to axios

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

When Gitlab URL is set as `gitlabURL` in the configuration file, `helm install` is not happy and complains about a missing `gitlabUrl`.

Ban Rugged from Repository

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

Realtime update of pipeline status in Files view

Closes #35779

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