For Geo, a file is created for configuration of the database. This file
shouldn't appear in CE, but if you've setup your GDK with a remote
pointing to CE and one to EE, this file might be around when switching
branches.

This will mark the workspace dirty, which annoys me more than it should.

[ci skip]

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

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

Log push output on exception

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

Minor fixes for the Helm docs

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

Resolve "Remove top padding on GPG popovers"

Closes #48296

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

Bump sprockets to 3.7.2 to address CVE-2018-3760

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

Unify spec/support/matchers/match_ids.rb

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

Raw diffs are served from Gitaly

Closes gitaly#222

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

Unify spec/features/admin/admin_groups_spec.rb

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

Fix boards issue highlight

Closes #48068

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

CE-EE parity for lib/gitlab/git/gitlab_projects.rb

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

[Rails5] Fix "'-1' is not a valid data_store"

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

Update lfs_administration.md with language edits

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

Add troubleshooting guide for lfs uploading timeouts

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