From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 10 Dec 2020 08:40:09 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7782e4dc0d9db4835c0f57232da9f8676c97d562;p=mastodon.git

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

Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
---

7782e4dc0d9db4835c0f57232da9f8676c97d562
diff --cc app/controllers/about_controller.rb
index 5d5db937c,dcad5d3b4..5ff6990d7
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@@ -1,7 -1,8 +1,10 @@@
  # frozen_string_literal: true
  
  class AboutController < ApplicationController
+   include RegistrationSpamConcern
+ 
 +  before_action :set_pack
++
    layout 'public'
  
    before_action :require_open_federation!, only: [:show, :more]