# Conflicts:
#	app/assets/javascripts/boards/components/board_list.vue
#	lib/gitlab/git_access.rb
#	lib/gitlab/path_regex.rb
#	spec/lib/gitlab/git_access_spec.rb

[ci skip]

Move board list vue component

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

Move BoardList vue component to vue file

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

CE upstream - 2018-02-06 18:23 UTC

Closes gitaly#980 et #4180

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

Add QA specs for LDAP login

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

Run bin/qa from anywhere

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

Now `Gitlab::Git::Popen#popen` takes an extra parameter, so we had to
adjust our mocks.

Reset `events` table primary key sequence to make sure it’s correct

Closes #42667

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

Add GitLab Geo Planned Failover doc

Closes #4397

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

# 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 "Push to create a new project"

Closes #26388

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

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

Closes #4820

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

Only set cwd on the newly spawned process, instead of the current one

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

# Conflicts:
#   lib/gitlab/path_regex.rb

Clarify Helm chart plans

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

Validate user, group and project paths consistently, and only once

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

Validate user namespace before saving so that errors persist on model

Closes #42140

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

Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd

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