Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2023-09-15 21:39:21 +02:00
276 changed files with 7006 additions and 1316 deletions
+1
View File
@@ -20,6 +20,7 @@
#
class Tag < ApplicationRecord
include Paginable
has_and_belongs_to_many :statuses
has_and_belongs_to_many :accounts
+1 -1
View File
@@ -8,7 +8,7 @@ class Trends::Statuses < Trends::Base
self.default_options = {
threshold: 5,
review_threshold: 3,
score_halflife: 2.hours.freeze,
score_halflife: 1.hour.freeze,
decay_threshold: 0.3,
}