From 31ea326e7670d049c32d2c251e592e5d991bbc90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 25 Jun 2019 14:32:19 +0000 Subject: 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 (cherry picked from commit d6c7d4c48db51fdc3eb479e53d40ce4358695218) ad3abd1d Silence backup warnings when CRON=1 in use --- changelogs/unreleased/sh-quiet-backup-secrets-log.yml | 5 +++++ lib/tasks/gitlab/backup.rake | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/sh-quiet-backup-secrets-log.yml 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 -- cgit v1.2.3