diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-25 10:51:41 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-25 10:51:41 +0100 |
| commit | 9990afb92c28c94e89a1c81c8b2f2c02c04dc86b (patch) | |
| tree | aecb679c6954c85b435b9fcad5c5199cde34b9b6 /lib/backup/files.rb | |
| parent | 10bba03843c155beb58b9d054029d2083776cc56 (diff) | |
| parent | b36941bdaad03eeb5ab23235b77f1bfad0348f18 (diff) | |
| download | gitlab-ce-9990afb92c28c94e89a1c81c8b2f2c02c04dc86b.tar.gz | |
Merge branch 'master' into ide-temp-file-folder-fixes
Diffstat (limited to 'lib/backup/files.rb')
| -rw-r--r-- | lib/backup/files.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/backup/files.rb b/lib/backup/files.rb index 88cb7e7b5a4..9895db9e451 100644 --- a/lib/backup/files.rb +++ b/lib/backup/files.rb @@ -53,6 +53,8 @@ module Backup FileUtils.mv(files, timestamped_files_path) rescue Errno::EACCES access_denied_error(app_files_dir) + rescue Errno::EBUSY + resource_busy_error(app_files_dir) end end end |