From 718fe268c48b3b77b2b3d901b0c688a06e82053d Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 24 May 2016 22:52:31 -0500 Subject: [PATCH] Improve after review --- lib/backup/manager.rb | 10 +++++----- 1 file 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