CE upstream - 2018-09-25 15:25 UTC

Closes gitlab-ce#51695 and #7728

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

The test was failing
https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/101444126 because
https://gitlab.com/gitlab-org/gitlab-ee/blob/a04056efad6639420b469eced5130751a8cf2757/ee/spec/support/request_store.rb
which is in EE only, clears the RequestStore before every test,
regardless of whether RequestStore is active. This test is unusual
because it sets up RequestStore without it being active, to make sure
that the tested code doesn’t attempt to use RequestStore. These two
unusual facts combined to cause the failure in EE only. The fix works
because of the particular order of RSpec hooks in the test lifecycle.

Downgrade Exclusive Lease warnings from Geo Log Cursor to debug

Closes #6428

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

[ci skip]

These warnings happen every 30 seconds, generating a lot of noise.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6428

Remove `fdescribe` from JS spec

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

Geo: sync disabled wikis. Stage 2

Closes #7623

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

Fix committer typo

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

Enable the ability to use the force env for rebuilding authorized_keys during a restore

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

CE upstream - 2018-09-24 18:22 UTC

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

Remove stage/unstage buttons from IDE commit list items

Closes #51695

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

Enable the ability to use the force env for rebuilding authorized_keys during a restore

Closes #7686

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

Cleanup polling of merge request widget in tests

Closes gitlab-ee#7728

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

Fast lookup of authorized SSH keys in the database was ported to CE in
v10.4. This change adds the option to enable the setting via the restore
rake task and assumes yes if the force env variable is set.

This reverts commit 4af3bf4d.

Ignore specific JS spec files in EESpecificCheck

Closes #3871

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

Add support for closing epics

Closes #7340, #3678, and #7013

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

CE port of Adding state to epics

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

Resolve "gitlab.com: Unable to import a project that was just exported"

Closes #43840, #43896, and #51747

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

Correct GitLab capitalization in EE-only files

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

We started syncing all the wiki regardless of the fact it's disabled or
not. We couldn't do that in one stage because of needing of smoth update
and deprecating things. This is the second stage that finally removes
unused columns in the geo_node_status table.

Add clarity to EE feature styles for features introduced before and after 9.2

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

Resolve "Provide NullStore for RequestStore"

Closes #51718

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

Postgres alignment padding – logic fixed

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

Update ldap.md If you escape the '\' character when using a "domain\user" scheme for the bind_dn name, it will fail. gitlab-ctl reconfigure escapes characters, and if you pre-escape the '\', the resultant yaml file will have four (4) '\' characters

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

use redirect instead of render to avoid creating keys when refresh - resolves #47942

Closes #47942

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

Update frontend tooling dependencies

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

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

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