Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 4 insertions, 11 deletions

diff --git a/lib/backup/task.rb b/lib/backup/task.rb
index 15cd2aa64d3..776c19130a7 100644
--- a/lib/backup/task.rb
+++ b/lib/backup/task.rb
@@ -6,13 +6,11 @@ module Backup
       @progress = progress
     end
 
-    # human readable task name used for logging
-    def human_name
-      raise NotImplementedError
-    end
-
     # dump task backup to `path`
-    def dump(path)
+    #
+    # @param [String] path fully qualified backup task destination
+    # @param [String] backup_id unique identifier for the backup
+    def dump(path, backup_id)
       raise NotImplementedError
     end
 
@@ -29,11 +27,6 @@ module Backup
     def post_restore_warning
     end
 
-    # returns `true` when the task should be used
-    def enabled
-      true
-    end
-
     private
 
     attr_reader :progress