# Conflicts:
#	.flayignore
#	app/controllers/projects/issues_controller.rb
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/namespace.rb
#	app/models/wiki_page.rb
#	config/routes/group.rb
#	db/schema.rb
#	doc/administration/auth/ldap.md
#	doc/user/group/index.md
#	locale/gitlab.pot
#	spec/factories/uploads.rb
#	spec/models/namespace_spec.rb
#	spec/uploaders/file_uploader_spec.rb

[ci skip]

Using correct column for sorting users by Recent Sign-in

Closes #26468

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

Fix path for Geo seeds file

Closes #4819 and gitlab-development-kit#320

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

Fix QA project clone wait condition

Closes gitlab-qa#175

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

Port to EE: 31885 Ability to transfer a single group to another group

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

31885 - Ability to transfer a single group to another group

Closes #31885

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

Added ldap config setting to lower case usernames

Closes #22607

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

Port from CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16791

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

Add feature highlight blue dot to GKE "Clusters" sidebar item -- EE merge edition

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

Add feature highlight blue dot to GKE "Clusters" sidebar item

Closes #41672

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

The `has_css?` line was always timing out false because `$(‘…’).val(url)` does not change the input’s value attribute.

From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760

Was reverted in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373

Include branch in mobile view for pipelines

Closes #42650

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

Handle EE edge cases in issues.closed_at migration

Closes gitlab-ee#4803

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

From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760

Was reverted in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373

Resolve "Different margins between buttons in tag list"

Closes #42584

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

Add missing foreign key and NOT NULL constraints to todos table.

Closes #32282

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

Port of 32282-add-foreign-keys-to-todos to EE.

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

More conversions of $.ajax to axios

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

Removing last_sign_in_at in specs

Allow moving wiki pages from the UI

Closes #37273

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

# Conflicts:
#   spec/models/repository_spec.rb

Resolve "`Set up CI` => `Set up CI/CD`"

Closes #42684

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