diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-24 14:07:37 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-25 06:30:51 -0700 |
| commit | ad3abd1d3ad5ae91596cc89671a93d49af9fc9ab (patch) | |
| tree | b610ac7b43c969bad913c1bbd0c6241b1e3ea36e | |
| parent | 1cffafbfd474cc34573cf136225693ebdd5c2efc (diff) | |
| download | gitlab-ce-ad3abd1d3ad5ae91596cc89671a93d49af9fc9ab.tar.gz | |
Silence backup warnings when CRON=1 in use
If CRON=1 is in use, we shouldn't generate any output or admins may be
notified via e-mail about unnecessary warnings.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63703
| -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 |