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

2021-02-22 15:23:46 +01:00
parent 8792128f38 2127f40e6b
commit 679642e26c
56 changed files with 761 additions and 359 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@ -16,6 +16,10 @@ class InstancePresenter
    Account.find_local(Setting.site_contact_username.strip.gsub(/\A@/, ''))
  end

+  def rules
+    Rule.ordered
+  end
+
  def user_count
    Rails.cache.fetch('user_count') { User.confirmed.joins(:account).merge(Account.without_suspended).count }
  end