CE upstream - 2018-10-01 09:21 UTC

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

Fix undefined format_options method in SchemaDumper for MySQL db

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

Skip creating auto devops jobs for sast, container_scanning, dast,…

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

Add notes about commits API to repository files documentation

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

Remove dropzonejs-rails (replaced by dropzone node module)

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

Fixed file templates not being fully fetched in Web IDE

Closes #51912

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

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

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

Resolve "Fill pipeline source for external pipelines"

Closes #51651

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

Geo - Does not raise error 500 on Geo projects list page for orphaned entries

Closes #7706

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

Merge branch '5196-geo-include-keep-around-and-other-references-in-the-checksum-calculation' into 'master'

Resolve "Geo: Include keep-around and other references in the checksum calculation"

Closes #5196

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

CE upstream - 2018-09-30 00:59 UTC

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

CE upstream - 2018-09-28 15:20 UTC

Closes gitlab-ce#51927

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

Check frozen string in style builds

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

This also adds specs for 3 distinct situations:

2. When there is an unknown pipeline with just a build
3. When there is an unknown pipeline with no statuses
1. When there is an unknown pipeline with a build and a status

Docs: improve Pages overview (to deprecate feature page)

Closes #50507

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

Docs: improve Pages overview (to deprecate feature page)

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

This changes guard against orphaned Geo::ProjectRegistry
entries that projects that have been deleted in the Geo
project list page. It also allows administrators to remove
those orphaned entries through UI.

The algorithm to calculate the checksum has changed.
We need to wipe any existing checksums in the database,
as any checksums generated with the old algorithm will
become invalid.

Geo: Fix Hashed Storage QA spec

Closes #7791

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

# Conflicts:
#   Gemfile.lock

Closes #51912

[Docs] Document how to merge translations from Crowdin

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

Docs for Project/Groups members API with inherited members

Closes #51404

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