This MR backports PrometheusMetric model to CE
and adds: common, identifier to figure out what kind of metric is used.

This MR backports PrometheusMetric model to CE
and adds: common, identifier to figure out what kind of metric is used.

Fix an error in docs about fetching artifacts using API

Closes gitlab-ce#50883

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

Add support for advanced CI/CD config extension / EE

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

Fix app/views/projects/settings/repository/show.html.haml

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

Merge branch 'ee-45938-postgres-timeout-when-counting-number-of-ci-builds-for-usage-ping' into 'master'

Resolve "Postgres timeout when counting number of CI builds for usage ping"

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

CE upstream - 2018-09-05 15:23 UTC

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

Remove unnecessary logic from group labels page

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

Allow MR authors to approve their MRs

Closes #3349 and #4738

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

# Conflicts:
#	app/views/layouts/application.html.haml
#	app/views/layouts/fullscreen.html.haml
#	app/views/layouts/header/_default.html.haml
#	app/views/projects/settings/repository/show.html.haml
#	locale/gitlab.pot

[ci skip]