Use restore() instead of reset() for removing axios MockAdapter

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

Geo: sync .gitattributes to info/attributes in secondary nodes

Closes #4101

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

CE upstream - Wednesday

Closes gitlab-runner#2652

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

Fix failed LDAP logins when sync_ssh_keys is included in config

Closes #4662

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

We tell users to set `sync_ssh_keys` to `false` if they don't
intend to use the feature. Strangely, `true` is not how you
enable it, rather you give it an LDAP attribute name. The
default value for `sync_ssh_keys` is `nil` which doesn't break
`Gitlab::LDAP::Person.ldap_attributes`, but `false` does. This
rejects `false` *and* `true` for good measure and adds an EE-only
test to ensure it doesn't regress.

Closes #4662

Set timezone for karma CI job to Etc/UTC (UTC+0)

Closes #42251

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

CE upstream - Tuesday

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

Resolve "CI failing on MergeRequestDiff#commits_count="

Closes #42340

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

CE upstream - Tuesday

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

Resolve "Modify the Geo setup instructions to copy gitlab-secrets.json between primary and secondary"

Closes #4253

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

Fix docs for GIT_CHECKOUT Gitlab Runner configuration

Closes gitlab-runner#2652

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

# Conflicts:
#	app/assets/javascripts/dispatcher.js

[ci skip]

CE upstream - Tuesday

Closes #4419, gitaly#936, and gitaly#890

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

Backport changes to Gitlab::Checks::ChangeAccess from EE

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

Refactor dispatcher milestones show path (EE)

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Refactor dispatcher milestones show path

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

consistent function exports for Labels edit/new pages

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

Capture push rule regex errors and present them to user

Closes #4585

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

remove webpack bundle tag for monitoring:environments:metrics

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

Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze

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

Adjust layout width for fixed layout #41830

Closes #41830

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

consistent function exports for Labels edit/new pages

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

# Conflicts:
#	spec/javascripts/pipelines/graph/stage_column_component_spec.js

[ci skip]

Upgrade jasmine + raven to newer versions

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

CE upstream - Tuesday

Closes gitlab-ce#38634

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