diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2017-11-21 21:33:18 +0100 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-21 21:40:18 +0100 |
| commit | 8f400ce31992a518d6dfa812520d8e2b867f5fc4 (patch) | |
| tree | 831c6c4891da72f7d6174514c95545459bdad673 | |
| parent | e1bee8e7c9fca21384903b7c2f270d806d6cc15c (diff) | |
| download | gitlab-ce-10-2-stable-prepare-final.tar.gz | |
Resolve conflicts in lib/tasks/gitlab/cleanup.rake10-2-stable-prepare-final
| -rw-r--r-- | lib/tasks/gitlab/cleanup.rake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake index a1a569cf8ee..a0c3e6adae8 100644 --- a/lib/tasks/gitlab/cleanup.rake +++ b/lib/tasks/gitlab/cleanup.rake @@ -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) |