Merge branch '39903-restore-backup-warning' into 'master'

Make restoring backup database table warning more explicit

Closes #39903

See merge request gitlab-org/gitlab-ce!15246

lib/tasks/gitlab/backup.rake

@@ -33,9 +33,10 @@ namespace :gitlab do
       backup.unpack
 
       unless backup.skipped?('db')
+        begin
           unless ENV['force'] == 'yes'
             warning = <<-MSG.strip_heredoc
-            Before restoring the database we recommend removing all existing
+              Before restoring the database, we will remove all existing
               tables to avoid future upgrade problems. Be aware that if you have
               custom tables in the GitLab database these tables and all data will be
               removed.
@@ -51,6 +52,10 @@ namespace :gitlab do
           Rake::Task['gitlab:db:drop_tables'].invoke
           $progress.puts 'done'.color(:green)
           Rake::Task['gitlab:backup:db:restore'].invoke
+        rescue Gitlab::TaskAbortedByUserError
+          puts "Quitting...".color(:red)
+          exit 1
+        end
       end
 
       Rake::Task['gitlab:backup:repo:restore'].invoke unless backup.skipped?('repositories')