diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-30 17:07:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-30 17:07:52 +0000 |
| commit | 0144dce7ee4ea92b588946599421184cd164ed1c (patch) | |
| tree | f201e1d1d31150c011c39cc07485f8c7e6762ed5 | |
| parent | c5d164d1df46eb34668a032b234484f142e1a881 (diff) | |
| parent | 3ce174c370cf45098bd592ac071e095b9f877363 (diff) | |
| download | gitlab-ce-0144dce7ee4ea92b588946599421184cd164ed1c.tar.gz | |
Merge branch 'fix_restore_warning' into 'master'
Fix restore warning message
## What does this MR do?
Fix the restore Rake task so it properly outputs the database warning. This is a pretty important warning and it was not even being output. After this fix, the output looks like the screenshot below.
See merge request !4980
| -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 52329ef928d..e79a45ca0a6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -48,6 +48,7 @@ v 8.9.3 - Reduce overhead and optimize ProjectTeam#max_member_access performance. !4973 - Use update_columns to by_pass all the dirty code on active_record. !4985 - 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) |