Fix Repository#processable? to allow .git repos in the root folder

parent 2af3400c
...@@ -33,8 +33,9 @@ module Gitlab ...@@ -33,8 +33,9 @@ module Gitlab
def processable? def processable?
return false if wiki? return false if wiki?
return false if hashed? && (group_path.blank? || project_name.blank?)
group_path.present? && project_name.present? true
end end
private private
......
...@@ -27,7 +27,13 @@ describe ::Gitlab::BareRepositoryImport::Repository do ...@@ -27,7 +27,13 @@ describe ::Gitlab::BareRepositoryImport::Repository do
expect(subject.processable?).to eq(false) expect(subject.processable?).to eq(false)
end end
it 'returns true when group and project name are present' do it 'returns true if group path is missing' do
subject = described_class.new('/full/path/', '/full/path/repo.git')
expect(subject.processable?).to eq(true)
end
it 'returns true when group path and project name are present' do
expect(subject.processable?).to eq(true) expect(subject.processable?).to eq(true)
end end
end end
...@@ -97,7 +103,7 @@ describe ::Gitlab::BareRepositoryImport::Repository do ...@@ -97,7 +103,7 @@ describe ::Gitlab::BareRepositoryImport::Repository do
expect(subject.processable?).to eq(false) expect(subject.processable?).to eq(false)
end end
it 'returns true when group and project name are present' do it 'returns true when group path and project name are present' do
expect(subject.processable?).to eq(true) expect(subject.processable?).to eq(true)
end end
end end
......
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