diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-30 17:07:52 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-30 15:26:05 -0400 |
| commit | a700bc4ce9260f2a6d7a7ae8a84236f60cb24577 (patch) | |
| tree | 783568e85c87335aea79d6ce93bfb981828b48e3 | |
| parent | ce8db128a948a618eb297c27fdde4f8322c36e87 (diff) | |
| download | gitlab-ce-a700bc4ce9260f2a6d7a7ae8a84236f60cb24577.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
(cherry picked from commit 0144dce7ee4ea92b588946599421184cd164ed1c)
| -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 e2a654f4462..b113bba7aef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,6 +9,7 @@ v 8.9.4 - Fixed URL on label button when filtering. !4897 - Fixed commit avatar alignment. !4933 - Do not show build retry link when build is active. !4967 + - Fix restore Rake task warning message output. !4980 v 8.9.3 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963 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) |