summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chrisjwilson.com>2017-06-08 17:09:06 +1000
committerChris Wilson <chris@chrisjwilson.com>2017-06-08 17:20:45 +1000
commitbe1edfcb4084de4f5e3db485eb40eae6627c4304 (patch)
tree1e7f2e90902960cacc488d6de873794de1e5c886
parentabc61f260074663e5711d3814d9b7d301d07a259 (diff)
downloadgitlab-ce-mrchrisw-fix-check-subgroups.tar.gz
Update gitlab:repo:check task to support subgroupsmrchrisw-fix-check-subgroups
gitlab:repo:check did not correctly support subgroups. This resulted in an error when checking subgroups: `Fatal: Not a git repository (or any of the parent directories): .git` Use Dir.glob to recursively walk repository directories. Only check those ending in .git
-rw-r--r--changelogs/unreleased/mrchrisw-fix-check-subgroups.yml4
-rw-r--r--lib/tasks/gitlab/check.rake8
2 files changed, 7 insertions, 5 deletions
diff --git a/changelogs/unreleased/mrchrisw-fix-check-subgroups.yml b/changelogs/unreleased/mrchrisw-fix-check-subgroups.yml
new file mode 100644
index 00000000000..940c1c5d41b
--- /dev/null
+++ b/changelogs/unreleased/mrchrisw-fix-check-subgroups.yml
@@ -0,0 +1,4 @@
+---
+title: Update gitlab:repo:check task to support subgroups
+merge_request:
+author:
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 63c5e9b9c83..5c2e1764ec1 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -507,11 +507,9 @@ namespace :gitlab do
desc "GitLab | Check the integrity of the repositories managed by GitLab"
task check: :environment do
Gitlab.config.repositories.storages.each do |name, repository_storage|
- namespace_dirs = Dir.glob(File.join(repository_storage['path'], '*'))
-
- namespace_dirs.each do |namespace_dir|
- repo_dirs = Dir.glob(File.join(namespace_dir, '*'))
- repo_dirs.each { |repo_dir| check_repo_integrity(repo_dir) }
+ repo_dirs = Dir.glob(File.join(repository_storage['path'], '**/*'))
+ repo_dirs.each do |repo|
+ check_repo_integrity(repo) if repo.end_with?('.git') && File.directory?(repo)
end
end
end