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

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

Reorganize menu classes - EE

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

Rails 5: fix presence message validation for prometheus_alert

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

EE Port for Resolve "Harmonize prettier and eslint configs"

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

CE upstream - 2018-10-09 13:02 UTC

Closes #7883

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

Assert prod environment is live after Auto Devops

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

doc-Resolve "Add Troubleshooting to Github Import"

Closes #43953

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

Improve the Repository files documentation

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

CE upstream - 2018-10-09 07:18 UTC

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

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

QA: Use basic auth to create cluster role binding

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

Documentation for feature flags defaulting to on

Closes gitlab-ee#7883

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

Use correct method

Add missing frozen_string_literal: true

Implement review feedback

Removed extra space

Squash 5 commits

docs/Tsumitsu Fix render issue in GFM documentation page

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

Use the standard PIP_CACHE_DIR for Python dependency caching template

Closes #52408

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

Add troubleshooting step about indexing a new server

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

Fix links that 404 and style changes

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

Adds the corresponding qa-* classes into the view files for each new
Page element we added.

Adjust the click actions to match.

Reject invalid branch names in repository compare controller

Closes #51003

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

Rails5: fix user edit profile clear status spec

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

Update to latest version of contributor-covenant.

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

Update to latest version of contributor-covenant.

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

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

# Conflicts:
#	doc/user/project/issues/create_new_issue.md

[ci skip]

QA: Allow the registration e2e test to be skipped

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

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

Geo: Disable backoff for file attachment types

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

The `--username` and `--password` top level options have been removed.

Fortunately we have a backwards compatible way of setting the
credentials via `kubectl config set-credentials <name>`, and using the
`--user <name>` top level option which is available at least in 1.10
(and possibly farther back).

- Some links internal links were incorrect.
- Removed some #overview anchor links, because they don't
  jump much content.
- Made text confirm to suggested proselint and mardownlint rules.

Bump rugged to 0.27.5 for security fixes

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

Don't backoff for uploads, LFS objects or CI job artifacts

Use project-level license check for Batch Comments

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