diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-03 09:03:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 09:03:11 +0200 |
| commit | 2aafdd0efb3fa0bf067e0b08a627a462793f296b (patch) | |
| tree | d559e2dec7ceb4c446db973b5c040a708d1c5756 /app/controllers/about_controller.rb | |
| parent | 9d7c323abdda66423751f3a25faf960674af8a49 (diff) | |
| parent | 6ee768b7b285382fce3270ad4cf06c71838182d8 (diff) | |
Merge pull request #1848 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/about_controller.rb')
| -rw-r--r-- | app/controllers/about_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index 620c0ff78..654f2d92c 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -10,10 +10,10 @@ class AboutController < ApplicationController 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: [:more, :terms] + before_action :set_expires_in, only: [:more] before_action :set_registration_form_time, only: :show - skip_before_action :require_functional!, only: [:more, :terms] + skip_before_action :require_functional!, only: [:more] def show; end @@ -28,8 +28,6 @@ class AboutController < ApplicationController @blocks = DomainBlock.with_user_facing_limitations.by_severity if display_blocks? end - def terms; end - helper_method :display_blocks? helper_method :display_blocks_rationale? helper_method :public_fetch_mode? |