diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
| commit | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (patch) | |
| tree | 5fbc5ebb3890ddbf0399bc1fd448f109561b2771 /app/controllers | |
| parent | 136458eaf4f73abc5bcb5d0b0978aff892e92f27 (diff) | |
| parent | b8efc3fc0b961d356472cf2e56fde69a6589ffaa (diff) | |
Merge remote-tracking branch 'origin/merge-upstream'
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/activitypub/inboxes_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/salmon_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb index 7d0bc74d3..af51e32d5 100644 --- a/app/controllers/activitypub/inboxes_controller.rb +++ b/app/controllers/activitypub/inboxes_controller.rb @@ -11,7 +11,7 @@ class ActivityPub::InboxesController < Api::BaseController process_payload head 202 else - [signature_verification_failure_reason, 401] + render plain: signature_verification_failure_reason, status: 401 end end diff --git a/app/controllers/api/salmon_controller.rb b/app/controllers/api/salmon_controller.rb index 143e9d3cd..ac5f3268d 100644 --- a/app/controllers/api/salmon_controller.rb +++ b/app/controllers/api/salmon_controller.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class Api::SalmonController < Api::BaseController + include SignatureVerification + before_action :set_account respond_to :txt @@ -9,7 +11,7 @@ class Api::SalmonController < Api::BaseController process_salmon head 202 elsif payload.present? - [signature_verification_failure_reason, 401] + render plain: signature_verification_failure_reason, status: 401 else head 400 end diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 7cd1abe0c..c853b5ab7 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -36,6 +36,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_favourite_modal, :setting_delete_modal, :setting_auto_play_gif, + :setting_display_sensitive_media, :setting_reduce_motion, :setting_system_font_ui, :setting_noindex, |