Notify conflict only for opened/locked merge requests

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

Make GFM Autocomplete configurable

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

Document how the new automatic review apps for docs work

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

Update project sidebar to work with EE feature Security Dashboard

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

Resolve "WebHookService doesn't handle user info with nil passwords"

Closes #46571

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

This was missed from
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20130

Fixed the IDE commit list item loosing its active state

Closes #48125

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

Always run review app for docs-only branches

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

Enforce setting string as value of the CI/CD variable

Closes #48210

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

[Rails5] Fix MysqlDateTimeWithTimeZone in rails 5

Closes #46275

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

Unify spec/javascripts/test_bundle.js

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

Delete non-latest merge request diff files upon MRs merge

Closes #37639

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

Closes #48125

Merge branch '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh-key-part-1' into 'master'

(Part 1) Resolve "Recognise when a user is trying to validate a private SSH key"

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

Fix auto_cancel_pending_pipelines check

Closes #47834

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

Unify filtered_search_token_keys_spec.js

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

Resolve "2FA should not attempt to use U2F in unsupported browsers"

Closes #40005 and #27772

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

Add test for "Bug: When creating an account with invalid characters the error is "Username already taken" not "Invalid characters used""

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

Merge branch '48260-change-the-bitbucket-import-page-to-indicate-that-its-for-bb-cloud-only-not-for-on-prem-bb' into 'master'

Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB"

Closes #48260

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

Resolve "Change the BitBucket import page to indicate that its for BB Cloud only, not for on-prem BB"

Resolve "Help users find our contributing page"

Closes #47274

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

Docs broken links

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

Refactor issue boards and get the EE changes to CE

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