Commit a700bc4c authored by Rémy Coutable's avatar Rémy Coutable Committed by Robert Speicher

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 0144dce7)
parent ce8db128
...@@ -9,6 +9,7 @@ v 8.9.4 ...@@ -9,6 +9,7 @@ v 8.9.4
- Fixed URL on label button when filtering. !4897 - Fixed URL on label button when filtering. !4897
- Fixed commit avatar alignment. !4933 - Fixed commit avatar alignment. !4933
- Do not show build retry link when build is active. !4967 - Do not show build retry link when build is active. !4967
- Fix restore Rake task warning message output. !4980
v 8.9.3 v 8.9.3
- Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem. !4963
......
...@@ -33,12 +33,13 @@ namespace :gitlab do ...@@ -33,12 +33,13 @@ namespace :gitlab do
unless backup.skipped?('db') unless backup.skipped?('db')
unless ENV['force'] == 'yes' unless ENV['force'] == 'yes'
warning = warning = <<-MSG.strip_heredoc warning = <<-MSG.strip_heredoc
Before restoring the database we recommend removing all existing Before restoring the database we recommend removing all existing
tables to avoid future upgrade problems. Be aware that if you have 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 custom tables in the GitLab database these tables and all data will be
removed. removed.
MSG MSG
puts warning.color(:red)
ask_to_continue ask_to_continue
puts 'Removing all tables. Press `Ctrl-C` within 5 seconds to abort'.color(:yellow) puts 'Removing all tables. Press `Ctrl-C` within 5 seconds to abort'.color(:yellow)
sleep(5) sleep(5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment