Skip to content
Snippets Groups Projects
Commit 0144dce7 authored by Rémy Coutable's avatar Rémy Coutable
Browse files

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
parents c5d164d1 3ce174c3
No related branches found
No related tags found
1 merge request!4980Fix restore warning message
Pipeline #
Loading
@@ -48,6 +48,7 @@ v 8.9.3
Loading
@@ -48,6 +48,7 @@ v 8.9.3
- Reduce overhead and optimize ProjectTeam#max_member_access performance. !4973 - Reduce overhead and optimize ProjectTeam#max_member_access performance. !4973
- Use update_columns to by_pass all the dirty code on active_record. !4985 - Use update_columns to by_pass all the dirty code on active_record. !4985
- Decreased min width of screen to 1280px for pinned sidebar - 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 - Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
- Update mobile button icons to be more inline with typical UI paradigms - Update mobile button icons to be more inline with typical UI paradigms
   
Loading
Loading
Loading
@@ -33,12 +33,13 @@ namespace :gitlab do
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment