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/user.rb
+++ b/app/models/user.rb
@@ -281,6 +281,10 @@ class User < ApplicationRecord
    save!
  end

+  def prefers_noindex?
+    setting_noindex
+  end
+
  def preferred_posting_language
    valid_locale_cascade(settings.default_language, locale, I18n.locale)
  end