diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-03-31 19:04:52 -0700 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-31 19:04:52 -0700 |
| commit | 16a6ea2d1769f68157976b83bf6da468dd38853d (patch) | |
| tree | aba2f578cdb588f9401dc867aeb65527ccd0110c | |
| parent | d77f333f9c7968337241904918d97f67dd5bae82 (diff) | |
| parent | 7ed8b76f64dc642aa23668a880f99ce1e99d766e (diff) | |
| download | gitlab-ce-16a6ea2d1769f68157976b83bf6da468dd38853d.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
| -rw-r--r-- | lib/backup/manager.rb | 2 | ||||
| -rw-r--r-- | spec/tasks/gitlab/backup_rake_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index afd05897509..d445150c55e 100644 --- a/lib/backup/manager.rb +++ b/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} ... " diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index 8a411b7720a..3d5d21c2a13 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/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 |