This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit 8f400ce3 authored by Winnie Hellmann's avatar Winnie Hellmann
Browse files

Resolve conflicts in lib/tasks/gitlab/cleanup.rake

parent aee043ebf088
......@@ -59,15 +59,11 @@ namespace :gitlab do
.sub(%r{^/*}, '')
.chomp('.git')
.chomp('.wiki')
<<<<<<< HEAD
next if Project.find_by_full_path(repo_with_namespace)
=======
# TODO ignoring hashed repositories for now. But revisit to fully support
# possible orphaned hashed repos
next if repo_with_namespace.start_with?('@hashed/') || Project.find_by_full_path(repo_with_namespace)
>>>>>>> b462edfddb... Merge branch '40291-ignore-hashed-repos-cleanup-repositories' into 'master'
new_path = path + move_suffix
puts path.inspect + ' -> ' + new_path.inspect
File.rename(path, new_path)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment