Merge branch 'main' into glitch-soc/merge-upstream

2021-11-19 18:51:41 +01:00
parent f2b376e9d8 db32835338
commit 2b4c7beb73
28 changed files with 337 additions and 333 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -45,7 +45,7 @@ class Status < ApplicationRecord
  # will be based on current time instead of `created_at`
  attr_accessor :override_timestamps

-  update_index('statuses#status', :proper)
+  update_index('statuses', :proper)

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