Merge branch 'sh-fix-abort-in-database-restore' into 'master'

Fix confusing error in database restore See merge request gitlab-org/gitlab!40790

Merge branch 'sh-fix-abort-in-database-restore' into 'master'
Fix confusing error in database restore See merge request gitlab-org/gitlab!40790
0a0557a3 · Douglas Barbosa Alexandre · 25def0d8 · 8432cf16 · 0a0557a3
Commit 0a0557a3 authored Aug 31, 2020 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/backup/database.rb lib/backup/database.rb +1 -1

No files found.
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -71,7 +71,7 @@ module Backup
      end
      report_success(success)
-      abort Backup::Error, 'Restore failed' unless success
+      abort 'Restore failed' unless success
    end
    protected