diff options
author | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
commit | 7a312a38f904e853f5703a0b678d0aec83fa858c (patch) | |
tree | eba4b787f6a617e1c2c5f7d4b5be66320212be1d /app/controllers/activitypub | |
parent | 3013c6cb78358ed8a95a35d5db79608fcb06963f (diff) | |
parent | 4ecfa8f298399d9857737f212fc8f5767ffa7c6d (diff) |
Merge branch 'glitch' into production
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 |