summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2017-09-21 13:00:58 +0100
committerTiago Botelho <tiagonbotelho@hotmail.com>2017-09-21 13:00:58 +0100
commit4c5acddaa7ac4982c20da326588a303371d47728 (patch)
tree7e8acd30da4e51feb92d814809616875617e19ff /lib/backup
parentcfccb2785fb8b98a013170aae4b931e9431739d1 (diff)
downloadgitlab-ce-4c5acddaa7ac4982c20da326588a303371d47728.tar.gz
Adds EE tag detection to remove_old in gitlab backup.
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/manager.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index f4051c95959..3cf3939994a 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -79,7 +79,7 @@ module Backup
# - 1495527122_gitlab_backup.tar
# - 1495527068_2017_05_23_gitlab_backup.tar
# - 1495527097_2017_05_23_9.3.0-pre_gitlab_backup.tar
- next unless file =~ /^(\d{10})(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+((-|\.)(pre|rc\d))?)?)?_gitlab_backup\.tar$/
+ next unless file =~ /^(\d{10})(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+((-|\.)(pre|rc\d))?(-ee)?)?)?_gitlab_backup\.tar$/
timestamp = $1.to_i