summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-24 22:52:31 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-24 22:52:31 -0500
commit718fe268c48b3b77b2b3d901b0c688a06e82053d (patch)
tree87d4a95515e7b0e42a1a7c520a72854852b0921a /lib/backup
parent12bd78103153fce845eed1566918083b52e814df (diff)
downloadgitlab-ce-718fe268c48b3b77b2b3d901b0c688a06e82053d.tar.gz
Improve after reviewfix-registry-backups
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/manager.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 5a727f5be5b..3e07096e6cc 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -1,7 +1,7 @@
module Backup
class Manager
- ARCHIVES_TO_BACKUP = %w{uploads builds artifacts lfs registry}
- FOLDERS_TO_BACKUP = %w{repositories db}
+ ARCHIVES_TO_BACKUP = %w[uploads builds artifacts lfs registry]
+ FOLDERS_TO_BACKUP = %w[repositories db]
def pack
# Make sure there is a connection
@@ -150,7 +150,7 @@ module Backup
end
def skipped?(item)
- settings[:skipped] && settings[:skipped].include?(item)
+ settings[:skipped] && settings[:skipped].include?(item) || disabled_features.include?(item)
end
private
@@ -160,11 +160,11 @@ module Backup
end
def archives_to_backup
- (ARCHIVES_TO_BACKUP - disabled_features).map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
+ ARCHIVES_TO_BACKUP.map{ |name| (name + ".tar.gz") unless skipped?(name) }.compact
end
def folders_to_backup
- (FOLDERS_TO_BACKUP - disabled_features).reject{ |name| skipped?(name) }
+ FOLDERS_TO_BACKUP.reject{ |name| skipped?(name) }
end
def disabled_features