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/activitypub | |
| parent | f48c7689d230b915ed740a4774736bd5998cbc66 (diff) | |
| parent | d8097ecd2f787aa0a065a753146151074eef55c6 (diff) | |
Merge pull request #1183 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/activitypub')
| -rw-r--r-- | app/controllers/activitypub/base_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/activitypub/inboxes_controller.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb index a3b5c4dfa..0c2591e97 100644 --- a/app/controllers/activitypub/base_controller.rb +++ b/app/controllers/activitypub/base_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class ActivityPub::BaseController < Api::BaseController + skip_before_action :require_authenticated_user! + private def set_cache_headers diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb index 7cfd9a25e..bcfc1e6d4 100644 --- a/app/controllers/activitypub/inboxes_controller.rb +++ b/app/controllers/activitypub/inboxes_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class ActivityPub::InboxesController < Api::BaseController +class ActivityPub::InboxesController < ActivityPub::BaseController include SignatureVerification include JsonLdHelper include AccountOwnedConcern |