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

Closes #5306

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

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]

Merge branch '50974-qa-group-filtering-fails-when-filter-text-field-is-filled-before-the-group-list-is-fully-loaded-leading-to-path-has-already-been-taken-error-qa-tries-to-create-a-bew-subgroup-qa' into 'master'

Resolve "[QA] Group filtering fails when filter text field is filled before the group list is fully loaded leading to "Path has already been taken" error QA tries to create a bew subgroup"

Closes #50974

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

Reduce queries for CI artifacts from MR widget

Closes gitlab-ce#43394

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

Filter web hooks by branch

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

Add missing paths to EE environment serializer

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

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

EE Port (Resolve "UI: Move "default branch" setting under "repository" settings")

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

Resolve "Return how many commits the source branch is behind the target branch through the API"

Closes #36534

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

Ignore irrelevant sql commands in metrics

Closes #51005

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

CE upstream - 2018-09-04 21:21 UTC

Closes gitlab-qa#28

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