diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
commit | c56a504d116d62fe669d15a270133d7c78dd61f1 (patch) | |
tree | 7400f3182f2a4ebd1606c37a1a5cad4cc95e443b /db/migrate/20181024224956_migrate_account_conversations.rb | |
parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
parent | c2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.
Diffstat (limited to 'db/migrate/20181024224956_migrate_account_conversations.rb')
-rw-r--r-- | db/migrate/20181024224956_migrate_account_conversations.rb | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb index 9f6c94fd1..12e0a70fa 100644 --- a/db/migrate/20181024224956_migrate_account_conversations.rb +++ b/db/migrate/20181024224956_migrate_account_conversations.rb @@ -62,16 +62,18 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2] end def up - say '' - say 'WARNING: This migration may take a *long* time for large instances' - say 'It will *not* lock tables for any significant time, but it may run' - say 'for a very long time. We will pause for 10 seconds to allow you to' - say 'interrupt this migration if you are not ready.' - say '' - - 10.downto(1) do |i| - say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true - sleep 1 + if $stdout.isatty + say '' + say 'WARNING: This migration may take a *long* time for large instances' + say 'It will *not* lock tables for any significant time, but it may run' + say 'for a very long time. We will pause for 10 seconds to allow you to' + say 'interrupt this migration if you are not ready.' + say '' + + 10.downto(1) do |i| + say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true + sleep 1 + end end migrated = 0 |