diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-06-07 14:09:25 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-07 20:09:25 +0200 |
| commit | 73540ffe6b03cf27dd7738ebd157573488f376cf (patch) | |
| tree | a8b37da451a087ae4c265de5cd7135b4a45c7119 /app/controllers/api/activitypub | |
| parent | 92bb16624632beb490bb84a51b9a868d4b71eb6a (diff) | |
Clean up for api/base controller (#3629)
* Move ApiController to Api/BaseController * API controllers inherit from Api::BaseController * Add coverage for various error cases in api/base controller
Diffstat (limited to 'app/controllers/api/activitypub')
| -rw-r--r-- | app/controllers/api/activitypub/activities_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/activitypub/notes_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/activitypub/outbox_controller.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/activitypub/activities_controller.rb b/app/controllers/api/activitypub/activities_controller.rb index 025ab960e..740c8589a 100644 --- a/app/controllers/api/activitypub/activities_controller.rb +++ b/app/controllers/api/activitypub/activities_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Api::Activitypub::ActivitiesController < ApiController +class Api::Activitypub::ActivitiesController < Api::BaseController include Authorization # before_action :set_follow, only: [:show_follow] diff --git a/app/controllers/api/activitypub/notes_controller.rb b/app/controllers/api/activitypub/notes_controller.rb index ff9383413..783c1c4ed 100644 --- a/app/controllers/api/activitypub/notes_controller.rb +++ b/app/controllers/api/activitypub/notes_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Api::Activitypub::NotesController < ApiController +class Api::Activitypub::NotesController < Api::BaseController include Authorization before_action :set_status diff --git a/app/controllers/api/activitypub/outbox_controller.rb b/app/controllers/api/activitypub/outbox_controller.rb index 7b6cbdd38..0738d7dee 100644 --- a/app/controllers/api/activitypub/outbox_controller.rb +++ b/app/controllers/api/activitypub/outbox_controller.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class Api::Activitypub::OutboxController < ApiController +class Api::Activitypub::OutboxController < Api::BaseController before_action :set_account respond_to :activitystreams2 |