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

2018-05-04 03:23:57 -05:00
parent 2d392fb3b8 c61ddd8249
commit da70208b45
10 changed files with 25 additions and 9 deletions
--- a/lib/mastodon/snowflake.rb
+++ b/lib/mastodon/snowflake.rb
@ -7,7 +7,7 @@ module Mastodon::Snowflake
    def self.around_create(record)
      now = Time.now.utc

-      if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at
+      if record.created_at.nil? || record.created_at >= now || record.created_at == record.updated_at || record.override_timestamps
        yield
      else
        record.id = Mastodon::Snowflake.id_at(record.created_at)