diff options
| author | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
| commit | 7a312a38f904e853f5703a0b678d0aec83fa858c (patch) | |
| tree | eba4b787f6a617e1c2c5f7d4b5be66320212be1d /app/controllers/public_timelines_controller.rb | |
| parent | 3013c6cb78358ed8a95a35d5db79608fcb06963f (diff) | |
| parent | 4ecfa8f298399d9857737f212fc8f5767ffa7c6d (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/public_timelines_controller.rb')
| -rw-r--r-- | app/controllers/public_timelines_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/public_timelines_controller.rb b/app/controllers/public_timelines_controller.rb index a5c981c7f..940b2f7cd 100644 --- a/app/controllers/public_timelines_controller.rb +++ b/app/controllers/public_timelines_controller.rb @@ -4,7 +4,8 @@ class PublicTimelinesController < ApplicationController before_action :set_pack layout 'public' - before_action :check_enabled + before_action :authenticate_user!, if: :whitelist_mode? + before_action :require_enabled! before_action :set_body_classes before_action :set_instance_presenter @@ -17,7 +18,7 @@ class PublicTimelinesController < ApplicationController private - def check_enabled + def require_enabled! not_found unless Setting.timeline_preview end |