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.

![Screen_Shot_2016-06-28_at_3.53.46_PM](/uploads/d250189d39fcacd0c8ec0aacf9cd930d/Screen_Shot_2016-06-28_at_3.53.46_PM.png)

See merge request !4980
(cherry picked from commit 0144dce7ee)
This commit is contained in:
Rémy Coutable
2016-06-30 15:26:05 -04:00
committed by Robert Speicher
parent ce8db128a9
commit a700bc4ce9
2 changed files with 3 additions and 1 deletions
+1
View File
@@ -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
+2 -1
View File
@@ -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)