Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

lib/backup/manager.rb

@@ -17,7 +17,7 @@ module Backup
           file << s.to_yaml.gsub(/^---\n/,'')
         end
-        FileUtils.chmod_R(0700, %w{db uploads repositories})
+        FileUtils.chmod(0700, %w{db uploads repositories})
         # create archive
         $progress.print "Creating backup archive: #{tar_file} ... "

spec/tasks/gitlab/backup_rake_spec.rb

@@ -87,7 +87,7 @@ describe 'gitlab:app namespace rake task' do
       expect(tar_contents).to match('db/')
       expect(tar_contents).to match('uploads/')
       expect(tar_contents).to match('repositories/')
-      expect(tar_contents).not_to match(/^.{4,9}[rwx]/)
+      expect(tar_contents).not_to match(/^.{4,9}[rwx].*(db|uploads|repositories)\/$/)
     end
     it 'should delete temp directories' do