Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests

* upstream/master: (86 commits)
  Fix unassign slash command preview
  Add CHANGELOG entry
  Show Runner's description on job's page
  Fix an N+1 for MRs from forks on the MR index page
  Improve documentation of SSRF protection
  Replace find file project spinach tests with RSpec
  Fix docs typo for ci/lint
  [Backport] Burndown chart for group milestone
  Bump lograge to 0.10.0 and remove monkey patch
  Add Capybara debugging methods to docs
  Update CHANGELOG.md for 10.7.1
  Add missing changelog entry
  Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"
  Fix users not seeing labels from private groups when being a member of a child project
  Update doorkeeper for:
  Update links to /ci/lint with ones to project ci/lint
  Resolve "Namespace factory is problematic"
  Auth::User classes refactor adds should_save?
  Replace define_method with alias_method in Omniauth Controllers
  Describe workaround when restore fails because of `Errno::EBUSY`
  ...

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