diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-05 18:41:30 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-05 18:41:30 +0300 |
| commit | cfd10655013e5a7e8481113ba168011862661b9f (patch) | |
| tree | 352fd5f4f85e35bb7917e583bd3728061518a933 | |
| parent | f90fc922dbcb8db5f8aadc6eee3d5a8c8c414375 (diff) | |
| parent | 7bc606592da43bbe6286d7a1c55bdad69927eb34 (diff) | |
Merge branch 'add-installation-type-backup-information' into 'master'
Add installation type to backup information file
See merge request gitlab-org/gitlab-ce!22150
| -rw-r--r-- | changelogs/unreleased/add-installation-type-backup-information.yml | 5 | ||||
| -rw-r--r-- | lib/backup/manager.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/add-installation-type-backup-information.yml b/changelogs/unreleased/add-installation-type-backup-information.yml new file mode 100644 index 00000000000..24cf4cc21f4 --- /dev/null +++ b/changelogs/unreleased/add-installation-type-backup-information.yml @@ -0,0 +1,5 @@ +--- +title: Add installation type to backup information file +merge_request: 22150 +author: +type: changed diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index 5d4a7efc456..afdc6f383c1 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -243,6 +243,7 @@ module Backup backup_created_at: Time.now, gitlab_version: Gitlab::VERSION, tar_version: tar_version, + installation_type: Gitlab::INSTALLATION_TYPE, skipped: ENV["SKIP"] } end |