This fixes the case when the comment is
posted right away instead of saving it
as draft first. It now resolves and
unresolves the discussion properly.

It also adds feature tests to cover
the resolving/unresolving scenarios:
- via creating a draft and publishing
- via publishing right away

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

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

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

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

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

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

See: https://github.com/libgit2/libgit2/releases

Move Issue#related_issues method to EE scope

Closes #7906

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

Closes #51003

Merge branch '52353-keyboard-navigation-project-slug-is-not-focused-on-new-project-page' into 'master'

Resolve "Keyboard navigation: "Project slug" is not focused on "New project" page"

Closes #52353

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

Instead of using instance-level. Prevents projects
in GitLab.com that don't have EEP level from showing
the EEP feature.

This is an EE only method. So ideally we should
move to EE scope to avoid conflicts on CE -> EE.

If SIGNUP_DISABLED is true skip any tests with a context
:skip_signup_disabled. The context is set for the registration tests.
This allows the tests to be skipped when run on the staging, which
doesn't allow registration

Removes expensive dead code on main MR page request

Closes #51172

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

Group-level Security Dashboard – Counts/Overview

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