diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-20 15:15:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-20 15:15:39 +0000 |
| commit | 2ce49b53b9a6315c258f658b89a5ff8104c37088 (patch) | |
| tree | 73b6d10fc0ba56315ab6f421f7d803456c9aab24 /lib | |
| parent | ff1deab6388dcb7f241205a1cd64eaddf1672753 (diff) | |
| parent | 0a60698892eb02e7966bc7f48f447b1c1068ba9d (diff) | |
| download | gitlab-ce-2ce49b53b9a6315c258f658b89a5ff8104c37088.tar.gz | |
Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'
Tighten up remove_old regex from gitlab backup manager.
Closes #32796
See merge request gitlab-org/gitlab-ce!14333
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/backup/manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index b9a573d3542..f4051c95959 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+)(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+.*)?)?_gitlab_backup\.tar$/ + next unless file =~ /^(\d{10})(?:_\d{4}_\d{2}_\d{2}(_\d+\.\d+\.\d+((-|\.)(pre|rc\d))?)?)?_gitlab_backup\.tar$/ timestamp = $1.to_i |