diff options
author | Rémy Coutable <remy@rymai.me> | 2019-06-25 14:32:19 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-06-25 14:32:19 +0000 |
commit | d6c7d4c48db51fdc3eb479e53d40ce4358695218 (patch) | |
tree | 6b8e18bcdb52ab0d6f2ccdb612bd470b7c814d50 /lib | |
parent | 30131a3aca2a26daafa22ed66fa97d720a504309 (diff) | |
parent | ad3abd1d3ad5ae91596cc89671a93d49af9fc9ab (diff) | |
download | gitlab-ce-d6c7d4c48db51fdc3eb479e53d40ce4358695218.tar.gz |
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
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tasks/gitlab/backup.rake | 4 |
1 files changed, 2 insertions, 2 deletions
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 |