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/app/models/status.rb
+++ b/app/models/status.rb
@@ -33,6 +33,10 @@ class Status < ApplicationRecord
  include Cacheable
  include StatusThreadingConcern

+  # If `override_timestamps` is set at creation time, Snowflake ID creation
+  # will be based on current time instead of `created_at`
+  attr_accessor :override_timestamps
+
  update_index('statuses#status', :proper) if Chewy.enabled?

  enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility