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

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

# Conflicts:
#	CHANGELOG.md
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/javascripts/jobs/store/getters.js
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	locale/gitlab.pot
#	qa/qa/page/project/menu.rb
#	spec/javascripts/pipelines/graph/stage_column_component_spec.js

[ci skip]

Merge branch '7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master'

Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message"

Closes #7493

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

Merge branch '7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master'

Backport: Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message"

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

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

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

[ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flags

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

Backport from EE: Fix color of text in resolution checkbox

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

Fix color of text in resolution checkbox

Closes #7944

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

[EE] First iteration to allow creating QA resources using the API

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

First iteration to allow creating QA resources using the API

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

The color was being inherited which, when
a non-default theme for syntax highlighting
caused this to change the color of the text
of the mentioned checkbox (in discussions tab,
replying to a code discussion).

Fix broken tokenization for filtered search bar in Epics

Closes #8031

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

This fixes the application row component weird state when an
`updating` status is fetched, this causes apps to show as uninstalled
even though they are installed in the cluster.

Harden the wiki against missing last_versions

Closes #52527

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

Remove prometheus configuration help text

Closes #52782

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

Use cached readme blobs where appropriate

Closes #49591

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

Fixed bug with the content disposition with wiki attachments

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

Round P/S labels up, not down

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

This fixes the application row component weird state when an
`updating` status is fetched, this causes apps to show as uninstalled
even though they are installed in the cluster.

GitLab keeps a cache of the rendered HTML for a repository's README as
stored in the HEAD branch. However, it was not used in all
circumstances. In particular, the new blob viewer framework bypassed
this cache entirely.

This MR ensures a ::ReadmeBlob is returned instead of a ::Blob when
asking a repository for an individual blob, if the commit and path
match the readme for HEAD. This makes the cached HTML available to
consumers, including the blob viewer.

The ReadmeBlob is a simple delegator to the Blob, so should be
compatible in all cases. Adding the rendered_markdown method is the
only additional behaviour it contains.

add link to concurrent devops

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

Remove gitlab-grit as a transitive dependency of GitLab

Closes #44361

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

EE port of "Remove gitlab-grit as a transitive dependency of GitLab"

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

Security Dashboard API hookup

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

Fix pagination and preloading of resources

Closes #7970

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