diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-05-12 13:58:09 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-05-12 09:32:54 -0600 |
| commit | a2b7252c337065db564993b72a269924608f0ee2 (patch) | |
| tree | a1f42f082c4fd5406b52b21f2255b946106db735 | |
| parent | 14da1aa563890d076d8a6a4944cee4e7bae096d8 (diff) | |
| download | gitlab-ce-a2b7252c337065db564993b72a269924608f0ee2.tar.gz | |
Merge branch 'sh-fix-failing-rc1-backup-spec' into 'master'
Fix failing backup filename spec for RCs
See merge request !11318
| -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 df2f2ce95e6..aee926877e0 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -352,7 +352,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}_\d+\.\d+\.\d+(-pre)?_gitlab_backup.tar$/) + expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+(-pre|-rc\d+)?_gitlab_backup.tar$/) end end end # gitlab:app namespace |