diff options
author | Rémy Coutable <remy@rymai.me> | 2017-04-26 18:22:33 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-04-26 18:22:33 +0000 |
commit | b5526a2d13386fa0e73750d05db4c40366927cba (patch) | |
tree | d15fe2ece82e4ada823f50fbe6ee696db7278f2e /spec | |
parent | 8e91aa9ba2261c93d5d40ee785945e077494fa82 (diff) | |
parent | 3bce12957037173011aec132acd1913fc702d48a (diff) | |
download | gitlab-ce-b5526a2d13386fa0e73750d05db4c40366927cba.tar.gz |
Merge branch 'gl-version-backup-file' into 'master'
Add GitLab version to backup file name
See merge request !10901
Diffstat (limited to 'spec')
-rw-r--r-- | spec/tasks/gitlab/backup_rake_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index daea0c6bb37..0a4a6ed8145 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -350,7 +350,7 @@ describe 'gitlab:app namespace rake task' do end it 'name has human readable time' do - expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_gitlab_backup.tar$/) + expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+(-pre)?_gitlab_backup.tar$/) end end end # gitlab:app namespace |