Merge pull request #25 from marlonandrade/master

Ignoring directories on rake test to upload files
ruby · Nov 27, 2014 · e10d691 · e10d691
2 parents d56d1e3 + 9eb7fab
commit e10d691
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/plugins/redmine_s3/lib/tasks/files_to_s3.rake b/plugins/redmine_s3/lib/tasks/files_to_s3.rake
@@ -31,8 +31,8 @@ namespace :redmine_s3 do
     # enqueue all of the files to be "worked" on
     fileQ = Queue.new
     storage_path = Redmine::Configuration['attachments_storage_path'] || File.join(Rails.root, "files")
-    Dir.glob(File.join(storage_path,'*')).each do |file|
-      fileQ << file
+    Dir.glob(File.join(storage_path,'**/*')).each do |file|
+      fileQ << file if File.file? file
     end
 
     # init the connection, and grab the ObjectCollection object for the bucket