# Conflicts:
#	ee/app/assets/javascripts/epics/epic_show/components/epic_show_app.vue

Remove ineffective Vue service specs -- EE merge edition

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

Merge branch 'ee-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdown' into 'master'

Add capitalize-header class to the projects dropdown on EE

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

Move sidebar app spec to correct location

Closes #4015

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

Fix bad merge conflict in MySQL to PostgreSQL doc

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

Document adding non-standard SSL certificates to the Geo secondary

Closes #2857

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

Refactor Geo::MoveRepositoryService

Closes #3950

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

Decouple QA test instance address - EE version

Closes gitlab-qa#88

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

Decouple QA test subject's address from Capybara/RSpec

Closes gitlab-qa#88

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

Move EE-only controllers, helpers, models, and services to top-level ee directory

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

CE upstream: Thursday

Closes gitlab-qa#87, gitaly#700, and gitlab-ce#39361

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

Fix epic header spacing

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

Squash and merge commit message docs

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Use a non-superuser user to access GitLab to ensure permissions are proper

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

EE clear filter on gitlab dropdown open

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

Global QA scenario arguments / EE version

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

Add epic sidebar

Closes #3556

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

[ci skip]

[ci skip]

Use a non-superuser user to access GitLab to ensure permissions are proper

Closes #39932

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

[EE-Compatibiliy] Prevent merge when fast-forward is required

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

Update changelogs for 10.1.2 on master

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

Fix margins in code quality widget

Closes #3974

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

This removes a duplicated section and makes the doc consistent with CE.

[ci skip]