Merge branch 'sh-quiet-backup-secrets-log' into 'master'

Silence backup warnings when CRON=1 in use

Closes #63703

See merge request gitlab-org/gitlab-ce!30033
This commit is contained in:
Rémy Coutable 2019-06-25 14:32:19 +00:00
commit d6c7d4c48d
2 changed files with 7 additions and 2 deletions

View file

@ -0,0 +1,5 @@
---
title: Silence backup warnings when CRON=1 in use
merge_request: 30033
author:
type: fixed

View file

@ -21,10 +21,10 @@ namespace :gitlab do
backup.cleanup
backup.remove_old
puts "Warning: Your gitlab.rb and gitlab-secrets.json files contain sensitive data \n" \
progress.puts "Warning: Your gitlab.rb and gitlab-secrets.json files contain sensitive data \n" \
"and are not included in this backup. You will need these files to restore a backup.\n" \
"Please back them up manually.".color(:red)
puts "Backup task is done."
progress.puts "Backup task is done."
end
# Restore backup of GitLab system