fix avatar restorer

lib/gitlab/import_export/avatar_restorer.rb

@@ -19,7 +19,7 @@ module Gitlab
       private
 
       def avatar_export_file
-        @avatar_export_file ||= Dir["#{avatar_export_path}/**/*"].first
+        @avatar_export_file ||= Dir["#{avatar_export_path}/**/*"].reject { |f| File.directory?(f) }.first
       end
 
       def avatar_export_path

spec/lib/gitlab/import_export/avatar_restorer_spec.rb

@@ -6,15 +6,16 @@ describe Gitlab::ImportExport::AvatarRestorer do
   let(:shared) { project.import_export_shared }
   let(:project) { create(:project) }
 
+  after do
+    project.remove_avatar!
+  end
+
+  context 'with avatar' do
     before do
       allow_any_instance_of(described_class).to receive(:avatar_export_file)
                                                   .and_return(uploaded_image_temp_path)
     end
 
-  after do
-    project.remove_avatar!
-  end
-
     it 'restores a project avatar' do
       expect(described_class.new(project: project, shared: shared).restore).to be true
     end
@@ -25,3 +26,15 @@ describe Gitlab::ImportExport::AvatarRestorer do
       expect(project.reload.avatar.file.exists?).to be true
     end
   end
+
+  it 'does not break if there is just a directory' do
+    Dir.mktmpdir do |tmpdir|
+      FileUtils.mkdir_p("#{tmpdir}/a/b")
+
+      allow_any_instance_of(described_class).to receive(:avatar_export_path)
+                                                  .and_return("#{tmpdir}/a")
+
+      expect(described_class.new(project: project, shared: shared).restore).to be true
+    end
+  end
+end