# Conflicts:
#	app/views/admin/application_settings/_form.html.haml
#	db/migrate/20160301174731_add_fingerprint_index.rb
#	db/schema.rb
#	doc/administration/operations/fast_ssh_key_lookup.md
#	doc/administration/operations/index.md

[ci skip]

CE upstream - Monday

Closes gitlab-qa#149, gitaly#857, #3968, and gitlab-ce#41624

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

Fixing bug related to wiki last version

Closes #41477 and #41506

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

Improve SSH database key lookup documentation

Closes #41399

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

Merge branch '4506-spec-failure-in-spec-ee-spec-services-ee-projects-hashed_storage-migrate_repository_service_spec-rb' into 'master'

Resolve "Spec failure in spec/ee/spec/services/ee/projects/hashed_storage/migrate_repository_service_spec.rb"

Closes #4506

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

Resolve "Download menu expands past the fold and doesn't auto size to the bottom height of the browser window"

Closes #41570

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

Fix changes dropdown ellipsis working across browsers

Closes #41561 and #41684

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

Make sure to change the DB cleaning strategy for Geo::BaseRegistry too in spec/services/groups/destroy_service_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>

fix example in ci ssh_keys documentation

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

`provider` is always required - remove confusing text

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

Add note about only 20 commits being included in push payload

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

Running this after
spec/services/projects/hashed_storage/migrate_repository_service_spec.rb would fail
previously, because the new repository path already existed on disk. As this spec expects
the new repository path to not exist on disk prior to being moved, we should clear out
the test repos before running.

Fix the header level for the Changelog Arguments documentation

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

Recommend against the use of EFS

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

Specifies the accepted refs for downloading an archive via the API

Closes #19843

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

Update irker documentation to mention an irker bug with key-protected channels.

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

Add option to disable commit stats to commit API

Closes #41681

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

Fix: remove unnecessary line

Closes #41501

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

Closes #41561

Backport authorized_keys

Closes gitlab-ee#3953

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

EE changes after moving fast authorized_keys feature to CE

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

Fixing re-ordering of an issue when dragging it to the bottom a long issue list in the board

Closes #36906

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

Remove preview_markdown from the global obj

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

Resolve "Pipeline graph uses inconsistent colors for its legend and its content"

Closes #41404

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

Backport "Fix environment scope regex" to CE

Closes gitlab-ee#4308

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

Save user ID and username in Grape API log (api_json.log)

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

Resolve "Install dev dependencies as devDependencies instead of dependencies"

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

This will enable admins to identify who actually made the API request.

Relates to #36960