diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-30 12:22:33 +0200 |
commit | 24968d20a07d483cd36b4747bd1db8bd512002c2 (patch) | |
tree | d306d08bc32edba292cf9aa85c3be8ba009c1b1c /app/controllers/public_timelines_controller.rb | |
parent | f48c7689d230b915ed740a4774736bd5998cbc66 (diff) | |
parent | b31b232edfcc7f04acf828bf6829ab716b290692 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock
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 |