summaryrefslogtreecommitdiff
path: root/lib/gitlab/bare_repository_import
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2017-12-21 16:49:32 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-01-03 16:13:32 -0200
commit58c2f3b5796cd8349dbd90404ed6ad0ca3ee6caf (patch)
tree86459098eccf86e5da84130522b00a9c3e506f9a /lib/gitlab/bare_repository_import
parent2af3400c4eeb0227ca6f38117323a18e9fbd7d9b (diff)
downloadgitlab-ce-58c2f3b5796cd8349dbd90404ed6ad0ca3ee6caf.tar.gz
Fix Repository#processable? to allow .git repos in the root folder
Diffstat (limited to 'lib/gitlab/bare_repository_import')
-rw-r--r--lib/gitlab/bare_repository_import/repository.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/bare_repository_import/repository.rb b/lib/gitlab/bare_repository_import/repository.rb
index b5907875460..85b79362196 100644
--- a/lib/gitlab/bare_repository_import/repository.rb
+++ b/lib/gitlab/bare_repository_import/repository.rb
@@ -33,8 +33,9 @@ module Gitlab
def processable?
return false if wiki?
+ return false if hashed? && (group_path.blank? || project_name.blank?)
- group_path.present? && project_name.present?
+ true
end
private