Skip to content
Snippets Groups Projects
Commit 225edac1 authored by ThibG's avatar ThibG Committed by Eugen Rochko
Browse files

Change /api/v1/timelines/public to require auth when public preview is off (#11802) 

Fixes #11289
parent 4e1b742c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/api/v1/timelines/public_controller.rb
+ 5
− 0
View file @ 225edac1
# frozen_string_literal: true # frozen_string_literal: true
class Api::V1::Timelines::PublicController < Api::BaseController class Api::V1::Timelines::PublicController < Api::BaseController
before_action :require_user!, only: [:show], if: :require_auth?
after_action :insert_pagination_headers, unless: -> { @statuses.empty? } after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
respond_to :json respond_to :json
...@@ -12,6 +13,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController ...@@ -12,6 +13,10 @@ class Api::V1::Timelines::PublicController < Api::BaseController
private private
def require_auth?
!Setting.timeline_preview
end
def load_statuses def load_statuses
cached_public_statuses cached_public_statuses
end end
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment