kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix_restore_warning' into 'master'

Browse source 
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
This commit is contained in:
Rémy Coutable 2016-06-30 17:07:52 +00:00
commit 0144dce7ee
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -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

3
lib/tasks/gitlab/backup.rake
View file

@ -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)