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

2022-10-28 11:36:25 +02:00
parent 371563b0e2 8dfe5179ee
commit cb19be67d1
567 changed files with 14361 additions and 20828 deletions
--- a/app/models/trends.rb
+++ b/app/models/trends.rb
@ -26,7 +26,7 @@ module Trends
  end

  def self.request_review!
-    return unless enabled?
+    return if skip_review? || !enabled?

    links_requiring_review    = links.request_review
    tags_requiring_review     = tags.request_review
@ -46,6 +46,10 @@ module Trends
    Setting.trends
  end

+  def self.skip_review?
+    Setting.trendable_by_default
+  end
+
  def self.available_locales
    @available_locales ||= I18n.available_locales.map { |locale| locale.to_s.split(/[_-]/).first }.uniq
  end