# Conflicts:
#	CHANGELOG.md

[ci skip]

Resolve "Personal projects pagination in Profile Overview tab is broken"

Closes #52564

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

Revert "Update code quality documentation"

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

[ci skip]

Send deployment_status when job starts environment

Closes #52614

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

[ci skip]

[ci skip]

Use Gitaly 0.125.1

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

The check was if the job `has_environment` which results into showing
the environment information when the job stops the environment. This
result into having a blank `deployment_status`.

Use `starts_environment?` to be the same as the haml we have in 11.3
https://gitlab.com/gitlab-org/gitlab-ce/blob/30f019dca78bb64bcb8b355a267be006884e6d8f/app/views/projects/jobs/show.html.haml#L28

CE upstream - 2018-10-15 11:21 UTC

Closes gitlab-com/gitlab-docs#234

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

Docs: fix table on API settings

Closes gitlab-com/gitlab-docs#234

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

Update docs maintenance upgrade path examples

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

Adjust link to docs development guide

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

Improve the contributing documentation

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

CE upstream - 2018-10-15 10:56 UTC

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

Add GitLab QA spec for adding a deploy token

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

Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work"

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

Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work"

Closes #7921

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

Improve spec for Gitlab::Ci::Status::Pipeline::Factory

Closes #52280

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

CE upstream - 2018-10-15 08:27 UTC

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

Enable some frozen string in lib/gitlab

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

Resolve "Show canary / no-canary in the performance bar"

Closes #52421

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

Only display merge commit SHA when it exists

Closes #48889

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

CE upstream - 2018-10-15 06:21 UTC

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

Update Android.gitlab-ci.yml for current stable SDK

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

CE upstream - 2018-10-14 23:21 UTC

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

Docs: Link to DeclarativePolicy framework from development guide

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

# Conflicts:
#	doc/administration/job_artifacts.md

[ci skip]