diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-10 09:40:09 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-10 09:41:49 +0100 |
| commit | 7782e4dc0d9db4835c0f57232da9f8676c97d562 (patch) | |
| tree | f1f1376074bd3ab6aa42624eabfd8d57a30f9c6b /app/controllers/about_controller.rb | |
| parent | b27d11dd3320cb005561f0bb1b81baecea8a7c43 (diff) | |
| parent | 49eb4d4ddf61e25c5aaab89aa630ddd3c7f3c23d (diff) | |
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.
Diffstat (limited to 'app/controllers/about_controller.rb')
| -rw-r--r-- | app/controllers/about_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index 5d5db937c..5ff6990d7 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -1,13 +1,17 @@ # frozen_string_literal: true class AboutController < ApplicationController + include RegistrationSpamConcern + before_action :set_pack + layout 'public' before_action :require_open_federation!, only: [:show, :more] before_action :set_body_classes, only: :show before_action :set_instance_presenter - before_action :set_expires_in, only: [:show, :more, :terms] + before_action :set_expires_in, only: [:more, :terms] + before_action :set_registration_form_time, only: :show skip_before_action :require_functional!, only: [:more, :terms] |