# Conflicts:
#	db/schema.rb
#	spec/features/projects/jobs_spec.rb

[ci skip]

10.4 licenses update

Closes #10

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

10.4 templates update

Closes #10

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

Fix error 500 when viewing commit and merge request diffs

Closes #41735

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

Due to the refactoring in !16082, `Blob#batch` no longer falls back
to a default `blob_size_limit`. Since `Repository#batch_blobs` was using
a default `nil` value, this would cause issues in the `Blob#find_by_rugged`
method.

This fix here is to be consistent and use a non-nil default value in
`Repository#batch_blobs`.

The problem was masked in development and tests because Gitaly is always
enabled by default for all features.

Closes #41735

Port of 22643-manual-job-page to EE

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

10.4 ce-to-ee doc update

Closes #10

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

CE upstream - Saturday

Closes gitlab-development-kit#310 and gitaly#872

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

Resolve "Improve non-triggered manual action job detail page"

Closes #22643 and #37843

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

Ee 41249 clearing the cache

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

Resolve "Clearing the cache"

Closes #41249

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

* master: (297 commits)
  Remove duplicate `rebase_commit_sha` field definition from schema
  Merge branch 'remove_labeled_issues_seed' into 'master'
  Create separate EE::DeploymentPlatform module
  Fixes cluster feature broken specs
  Fix typo in CHANGELOG entry for Geo doc fix
  Fix typos in gitlab:geo:check sentence
  Make it clearer database password only needed for 10.4 and up
  Add clarification pg password from 10.4 onward
  Move geo status check after db replication
  Remove duplicate manual NTP check
  Fix broken alignment of geo db docs
  EE Port for making IDE prettier
  Fix rebase commit SHA migration name
  Resolve conflict in lib/api/entities.rb
  Resolve conflict in doc/api/settings.md
  Resolve conflict in doc/api/boards.md
  Resolve conflict in app/models/concerns/deployment_platform.rb
  Resolve conflict in BranchesHelper by adding EE::BranchesHelper
  Fix conflicts in merge_request_widget.json spec
  Fix conflicts in mr_widget_options.js
  ...

# Conflicts:
#	db/migrate/20160621123729_add_rebase_commit_sha_to_merge_requests.rb
#	lib/gitlab/git/repository.rb

[ci skip]

Fix rebase commit SHA migration name

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

CE upstream - Friday

Closes gitaly#833 and gitlab-ce#41563

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

Merge branch '41056-create-cluster-from-kubernetes-integration-application-template-ee' into 'master'

Create Separate EE::DeploymentPlatform module

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

Remove labeled issues seed

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

Skip project repository disk validation in development project seeder

Closes gitlab-development-kit#310

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

Move gitlab:geo:check after database replication

Closes #4481

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

Fix broken alignment of database password in geo docs

Closes #4483

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

Remove labeled issues seed

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