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 /lib/backup | |
| 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 'lib/backup')
| -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 8d64c82272a..330cd963626 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -15,7 +15,7 @@ module Backup s[:gitlab_version] = Gitlab::VERSION s[:tar_version] = tar_version s[:skipped] = ENV["SKIP"] - tar_file = "#{s[:backup_created_at].strftime('%s_%Y_%m_%d')}#{FILE_NAME_SUFFIX}" + tar_file = "#{s[:backup_created_at].strftime('%s_%Y_%m_%d_')}#{s[:gitlab_version]}#{FILE_NAME_SUFFIX}" Dir.chdir(backup_path) do File.open("#{backup_path}/backup_information.yml", "w+") do |file| |