# Conflicts:
#	app/assets/stylesheets/pages/settings.scss

[ci skip]

Add helper methods to stub Gitlab::ExclusiveLease

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

[EE] Add helper methods to stub Gitlab::ExclusiveLease

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

CE upstream - 2018-06-28 18:21 UTC

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

i18n: externalize strings from 'app/views/admin/identities'

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

Style updates for personal access token form

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

Resolve "Merge request refactor displays changes dropdown incorrectly"

Closes #48497

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

Improve error messaging across various IDE actions

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

Add pipeline stages position clean-up migration

Closes #45956

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

Add transfer project endpoint to the Projects API

Closes #45146

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

[Rails5] fix NoMethodError: undefined method 'downcase' for Hash

Closes #6749

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

[Rails5] fix Projects::VulnerabilityFeedbackController didn't match the schema

Closes #6747

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

Fix ambiguous due_date column for Issue scopes

Closes #47769

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

[Rails5] fix Boards::ListsController expected the response to have status code 200 but it was 403

Closes #6746

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

Always serve favicon from main GitLab domain so that CI badge can be drawn over it

Closes #47802

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

Enabling Doorkeeper reuse_access_token option

Closes #46278

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

Rails5 fix MySQL milliseconds problem in specs

Closes #48430

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

Rails5 fix Mysql comparison failure caused by milliseconds problem

Closes #48432

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

QA: Fix waiting for Geo replication tests when replication is slow

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

in this it also removes Vue Resource from the IDE, axios is nicer to test

Merge branch '43472-remove-environment-scope-field-on-cluster-creation-form-for-core-starter-plans' into 'master'

Resolve "Remove "environment scope" field on cluster creation form for core/starter plans"

Closes #43472

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

Merge branch 'ee-43472-remove-environment-scope-field-on-cluster-creation-form-for-core-starter-plans' into 'master'

Adds a test for the environment scope field

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

Fix OAuth application authorization screen to appear with every access

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