diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-30 15:40:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 15:40:28 +0200 |
| commit | 4ecfa8f298399d9857737f212fc8f5767ffa7c6d (patch) | |
| tree | 16896fc6f86c006ed6aba93db23cdec84c11bee3 /app/controllers/public_timelines_controller.rb | |
| parent | f48c7689d230b915ed740a4774736bd5998cbc66 (diff) | |
| parent | d8097ecd2f787aa0a065a753146151074eef55c6 (diff) | |
Merge pull request #1183 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |