Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8551

# Conflicts:
#	CHANGELOG.md
#	PHILOSOPHY.md
#	doc/user/discussions/index.md
#	doc/user/project/labels.md
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-11-21 02:21 UTC

Closes gitlab-ce#53571

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

Eliminate duplicated words (in apps)

Closes #54230

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

Reinstate changes from MR 23234

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

Add documentation for notes filters

Closes #53908

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

Handle force_remove_source_branch when creating merge request

Closes #51220

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

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>

Add Pages access control user docs

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

This reinstates the changes added in MR
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23234. I was
testing a script that was supposed to operate on a fork of CE
(yorickpeterse/gitlab-ce), but it was operating on gitlab-org/gitlab-ce
by accident.

deprecate UX Guide and redirect to design.gitlab

Closes #54089

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

Deprecate UX Guide and redirect to design.gitlab

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

Creating a merge request with
`merge_request[force_remove_source_branch]` parameter would result in an
Error 500 since this attribute was passed directly to the merge request.
Fix this by properly parsing this attribute into `merge_params`.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51220

This reverts merge request !23234

Documentation: Fix typo in Merge request description

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

Notes/Discussions filters documentation was missingg.

Make existing SSH create / remove test into a Smoke test

Closes #52699

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

Use cached size when passing artifacts to Runner

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

Precisions about the times specified in gitlab.rb for Rack Attack

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

Update "Create new group" docs

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

Fixes stuck tooltip on stop env button

Closes #53571 and #54282

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

Work around Ruby 2.5.3 crash when a CI job is selected

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

Docs: specify regexp language used for `only`/`except` mechanism in `.gitlab-ci.yaml`

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

Port of EE-translations to CE

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

Adds missing status in deployment widget

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

Documented Response of /wikis/home should be a wiki object and not an array

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

Resolve "Access project from descendent groups when selecting project to create new issue"

Closes #47096 and #52453

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

[ci skip]