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

Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
2022-12-07 09:03:42 +01:00
parent fe523a3045 b59fb28e90
commit 9a3d91f629
22 changed files with 443 additions and 59 deletions
--- a/app/models/concerns/domain_materializable.rb
+++ b/app/models/concerns/domain_materializable.rb
@@ -14,7 +14,6 @@ module DomainMaterializable

    Instance.refresh
    count_unique_subdomains!
-
  end

  def count_unique_subdomains!