# Conflicts:
#	app/models/project_feature.rb
#	db/schema.rb

[ci skip]

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

Closes gitlab-ce#51695 and #7728

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

Dedupe frontend dependencies

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

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.

Add gitlab-ui skeleton loading

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

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

Update doc/user/project/repository/index.md

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

Remove `fdescribe` from JS spec

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

Troubleshoot "Transient failure in qa/specs/features/project/fork_project_spec.rb"

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

Enable more frozen string in app/controllers/

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

Geo: sync disabled wikis. Stage 2

Closes #7623

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

CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6906

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

Fix committer typo

Closes #51808

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

Fix committer typo

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

Fix margins in merge request header

Closes #51726

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

[CE] Improve review apps

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

Render 412 when invalid UTF-8 is passed as parameter

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

Add clean-up phase for ScheduleDiffFilesDeletion migration

Closes #51469

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

QA: Allow registration when LDAP is enabled

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

`.has_personal_area?` waits for sign in but does not ensure that it's
successful. Raise an exception if not successful so we can capture
a screenshot at the point of failure

Adds a workaround and code to help troubleshoot why a new user doesn't
stay signed in after loading a project page.

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

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.

Cleanup polling of merge request widget in tests

Closes gitlab-ee#7728

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

Process any remaining ScheduleDiffFilesDeletion workers and remove
temporary added index.

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

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.