# 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]

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