summaryrefslogtreecommitdiff
path: root/lib/backup/files.rb
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-04-26 09:45:01 +0800
committerDylan Griffith <dyl.griffith@gmail.com>2018-04-26 09:45:01 +0800
commitc80e6b9c1229776cf5af065954b99c182cc046c2 (patch)
tree5b9d1ca0c9f0101fd663fd83d68012c49f0ab54b /lib/backup/files.rb
parent51cc01b6c9468056f40cdc8deb0e4b6414a3ccb9 (diff)
parent55f07cc32e7684b21e0c1662c70128df14c6abf7 (diff)
downloadgitlab-ce-c80e6b9c1229776cf5af065954b99c182cc046c2.tar.gz
Merge branch 'master' into siemens-runner-per-group
Diffstat (limited to 'lib/backup/files.rb')
-rw-r--r--lib/backup/files.rb2
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