# Conflicts:
#	doc/raketasks/cleanup.md

[ci skip]

CE upstream - 2018-07-31 21:22 UTC

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

Raise error when stubbing a feature that is not defined on license.rb

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

Port of mk/add-local-project-uploads-cleanup-task to EE

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

Add local project uploads cleanup task

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

# Conflicts:
#	app/controllers/projects/lfs_api_controller.rb
#	spec/requests/lfs_http_spec.rb

[ci skip]

CE upstream - 2018-07-30 21:22 UTC

Closes gitaly#768, #7038, and gitlab-ce#49725

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

Enable no-console ESLint rule for tests

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

Resolve "Pseudonymizer::Uploader should not call abort"

Closes #7026

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

Fix LFS uploads not working with git-lfs 2.5.0

Closes #49752

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

Fix LFS uploads not working with git-lfs 2.5.0 (EE port)

Closes gitlab-ce#49752

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

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

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

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

Track the Geo event log gaps in redis and handle them later

Closes #6956

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

Resolve "Add Security Dashboard to project quick links"

Closes #6786

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

This reverts commit 9981781b.

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

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

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

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

git-lfs 2.5.0 now sets the Content-Type header instead of hard-coding it to
application/octet-stream: https://github.com/git-lfs/git-lfs/pull/3137

To avoid this issue, we explicitly tell the client to use
application/octet-stream.

Closes gitlab-org/gitlab-ce#49752

Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"

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

Code cleaning in PostReceive services

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

Track registries marked as synced when repository does not found

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

Remove git rake tasks

Closes #41699 and gitaly#768

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

Remove git rake tasks ee

Closes gitaly#768

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

This reverts merge request !20801

git-lfs 2.5.0 now sets the Content-Type header instead of hard-coding it to
application/octet-stream: https://github.com/git-lfs/git-lfs/pull/3137

To avoid this issue, we explicitly tell the client to use
application/octet-stream.

Closes #49752

Delete todos when users loses target read permissions

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

While reviewing this branch it was noted that this task was broken.
Given the limited value this task brings, and given the fact that much
of the old behaviour has been moved to be automatically fixed, removing
was a good option.

Suggestion in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20806#note_91261001

While reviewing this branch it was noted that this task was broken.
Given the limited value this task brings, and given the fact that much
of the old behaviour has been moved to be automatically fixed, removing
was a good option.

Suggestion in:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20806#note_91261001

This branch includes changes that removes a rake taks that cleans up
config.lock files.

This change bumps Gitaly so it happens automatically so users don't have
to bother.

These tasks are happening through housekeeping right now, by default
ever 10th push. This removes the need for these tasks.

Side note, this removes one of my first contributions to GitLab, as back
than I introduced these tasks through: 54e6c004

Closes https://gitlab.com/gitlab-org/gitaly/issues/768