diff options
| author | Drew Blessing <drew@gitlab.com> | 2016-06-28 15:51:50 -0500 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2016-06-28 15:54:40 -0500 |
| commit | 3ce174c370cf45098bd592ac071e095b9f877363 (patch) | |
| tree | 86336e96bdeb07affa2c5fe9a7f16cbd6046424f | |
| parent | 3b33cbb21146fe41582fa33a8e6d0d0f709b8478 (diff) | |
| download | gitlab-ce-3ce174c370cf45098bd592ac071e095b9f877363.tar.gz | |
Fix restore warning message
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/backup.rake | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 047debbcd2b..b5f8f423026 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ v 8.10.0 (unreleased) v 8.9.3 (unreleased) - Decreased min width of screen to 1280px for pinned sidebar + - Fix restore Rake task warning message output !4980 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem - Update mobile button icons to be more inline with typical UI paradigms diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index 9ee72fde92f..b43ee5b3383 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -33,12 +33,13 @@ namespace :gitlab do unless backup.skipped?('db') unless ENV['force'] == 'yes' - warning = warning = <<-MSG.strip_heredoc + warning = <<-MSG.strip_heredoc Before restoring the database we recommend removing all existing tables to avoid future upgrade problems. Be aware that if you have custom tables in the GitLab database these tables and all data will be removed. MSG + puts warning.color(:red) ask_to_continue puts 'Removing all tables. Press `Ctrl-C` within 5 seconds to abort'.color(:yellow) sleep(5) |