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

Closes #6136

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

Jira DVCS docs - Call out differences between 11.3 and before

Closes #7400

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

Update user markdown documentation for CommonMark

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

port "Improve project overview UI" to EE

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

Expand instance-level templates to cover .gitlab-ci.yml, .gitignore and Dockerfile

Closes #5306

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

# Conflicts:
#	app/views/groups/labels/index.html.haml
#	doc/ci/yaml/README.md
#	lib/gitlab/ci/config.rb

[ci skip]

Add route information to lograge structured logging for API logs

Closes #50993

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

Fix documentation on upgrading when using a Helm chart

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

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 with `extends:`

Closes gitlab-ee#6136

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

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

Fix multipart error on rails reload

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

remove comma

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

Merge branch '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"

Closes #45938

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

Document that when updating using a Helm chart 'helm repo update' needs to be run before the 'helm upgrade ...' command.  

then each commit or push triggers your CI pipeline. 

Remove unnecessary logic from group labels page

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

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]