diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-30 11:10:46 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:02:20 -0600 |
| commit | b4d97bc26baff0a9867f1e510a7630dd34b8049d (patch) | |
| tree | 4637f1ead39e9e0748066445f94798b0d5f38fd4 /app/controllers/public_timelines_controller.rb | |
| parent | 08f6b74097aacb2cf1c3894d4a58c0b2272a9fa5 (diff) | |
port tootsuite#11292 to monsterfork: Add whitelist mode
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 e0609ec12..d668dbb94 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 |