Merge remote-tracking branch 'upstream/master' into upstream-merge-again

2017-10-16 21:13:47 +02:00
parent 4b397adb5b 34118169ac
commit 8b9ee5f16b
4 changed files with 73 additions and 28 deletions
--- a/db/migrate/20170920024819_status_ids_to_timestamp_ids.rb
+++ b/db/migrate/20170920024819_status_ids_to_timestamp_ids.rb
@ -26,7 +26,7 @@ class StatusIdsToTimestampIds < ActiveRecord::Migration[5.1]
      SELECT setval('statuses_id_seq', (SELECT MAX(id) FROM statuses));
      ALTER TABLE statuses
        ALTER COLUMN id
-        SET DEFAULT nextval('statuses_id_seq');"
+        SET DEFAULT nextval('statuses_id_seq');
    SQL
  end
 end