diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-06-25 14:32:19 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2019-06-25 16:25:16 +0000 |
| commit | 31ea326e7670d049c32d2c251e592e5d991bbc90 (patch) | |
| tree | c22a8ca1322620c9045de0838afba9cd54c7ecfd | |
| parent | e59b82c955294257eecd8f6c6869092b6e339e3c (diff) | |
| download | gitlab-ce-12-0-stable-patch-2.tar.gz | |
Merge branch 'sh-quiet-backup-secrets-log' into 'master'12-0-stable-patch-2
Silence backup warnings when CRON=1 in use
Closes #63703
See merge request gitlab-org/gitlab-ce!30033
(cherry picked from commit d6c7d4c48db51fdc3eb479e53d40ce4358695218)
ad3abd1d Silence backup warnings when CRON=1 in use
| -rw-r--r-- | changelogs/unreleased/sh-quiet-backup-secrets-log.yml | 5 | ||||
| -rw-r--r-- | lib/tasks/gitlab/backup.rake | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/sh-quiet-backup-secrets-log.yml b/changelogs/unreleased/sh-quiet-backup-secrets-log.yml new file mode 100644 index 00000000000..cf3e90c0cb1 --- /dev/null +++ b/changelogs/unreleased/sh-quiet-backup-secrets-log.yml @@ -0,0 +1,5 @@ +--- +title: Silence backup warnings when CRON=1 in use +merge_request: 30033 +author: +type: fixed diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index c531eb1d216..2bf71701b57 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -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 |