For next files:

- app/controllers/admin/application_settings_controller.rb
- config/routes/admin.rb
- locale/gitlab.pot
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# Conflicts:
#	app/controllers/admin/application_settings_controller.rb
#	config/routes/admin.rb
#	locale/gitlab.pot
#	spec/features/admin/admin_settings_spec.rb

[ci skip]

Resolve "Split admin settings into multiple sub pages"

Closes #44998

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

EE Port: Split admin settings into subpages

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

CE upstream - 2018-09-20 12:21 UTC

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

Fixed hidden truncated diff lines not showing when expanded

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

Review app cleanup on schedule not on tags and in master

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

CE upstream - 2018-09-20 09:24 UTC

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

Add quota information for job API

Closes #7441

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

Lazy load xterm css custom colors file

Closes #44768

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

Document Review Apps

Closes #51201

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

Resolve "Link to file in Changes tab of MR no longer works for all files after incremental rendering improvement"

Closes #50347

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

Resolve "Link to file in Changes tab of MR no longer works for all files after incremental rendering improvement"

CE upstream - 2018-09-20 06:24 UTC

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

Explain the docs' CD, relating to the milestone the doc is set to vs online docs

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

Correct Gitaly config typo in update guides

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

Fix link to blog posts in docs

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

Remove duplicated code in Geo event store specs

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

CE upstream - 2018-09-20 00:21 UTC

Closes gitlab-ce#51380

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

This introduces a shared example that encapsulates the common
behavior present in the parent class removing the duplicated
code in the specs.

The 9.4 to 9.5 and 9.5 to 10.0 guides missed a closing backtick. This
was corrected in the 10.0 to 10.1 guide, from which subsequent guides
were written without the error.

Due to a missing `s`, a link to the blog archive
for releases was broken.

Delete container repository tags outside of transaction

Closes #51380

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

Merge branch '5748-geo-decrease-frequency-of-project-shard-schedulers-when-few-projects-to-schedule' into 'master'

Geo: Decrease frequency of project shard schedulers when few projects to schedule

Closes #5748

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

If last time we checked, there were no pending resources, we set a back
off time to decrease the frequency of pool

CE upstream - 2018-09-19 18:26 UTC

Closes gitlab-org/release/framework#16

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

Improve review apps

Closes #6875

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

Revert "Merge branch 'ee-44998-split-admin-settings-into-multiple-sub-pages' into 'master'"

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

CE upstream - 2018-09-19 15:21 UTC

Closes gitlab-ce#48873

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

Fix rubocop Style/ZeroLengthPredicate

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