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

# Conflicts:
#	doc/api/settings.md
#	lib/gitlab/email/handler.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-09-03 12:23 UTC

Closes #2635

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

Add omnibus instractions for packages feature

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

Cleanup of api settings.md doc

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

Cleanup of (EE) api settings.md doc

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

Move badge settings to general settings

Closes #46590

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Extract EE-specific lines from Gitlab::Email::Handler

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

Resolve "Extract EE specific files/lines for lib/gitlab/email/handler.rb"

Closes #6417

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

Add JSON logging for Bitbucket Server importer

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

# Conflicts:
#	app/views/groups/labels/index.html.haml
#	config/initializers/1_settings.rb
#	doc/update/README.md

[ci skip]

Fix spacing, typos, add missing settings, and remove deprecated ones.

Add JUnit Java examples in docs

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

Bump GitLab Pages to v1.1.0

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

Fix spacing, typos, add missing settings, and remove deprecated ones.

Hide PAT creation advice for HTTP clone if PAT exists

Closes #44111

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

Added atom feed for tags

Closes #2635

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

Add updated ce images to kubernetes install doc

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

Update SAST supported language list

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

Docs port ee community contributions

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

Update gitlab_chart.md to fix example domain spelling missing "l"

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

Use sample data if repo has no commit in ChatService

Closes #50564

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

Show secure results on environments page, backend

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