diff options
| author | Reverite <github@reverite.sh> | 2019-10-28 15:15:33 -0400 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-28 15:15:33 -0400 |
| commit | 1150110d50d9060fc325825c6770e7ef773ebcff (patch) | |
| tree | 816e549592c184ffe6f545e7def2f785517be0c0 /app/controllers | |
| parent | 205debc43d841afaa1b2ed7dfd05a6d1b6d9d5e0 (diff) | |
| parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/activitypub/inboxes_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb index bcfc1e6d4..291eec19a 100644 --- a/app/controllers/activitypub/inboxes_controller.rb +++ b/app/controllers/activitypub/inboxes_controller.rb @@ -7,6 +7,7 @@ class ActivityPub::InboxesController < ActivityPub::BaseController before_action :skip_unknown_actor_delete before_action :require_signature! + skip_before_action :authenticate_user! def create upgrade_account diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index f05dbe0ea..75c3e2495 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -60,6 +60,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_use_blurhash, :setting_use_pending_items, :setting_trends, + :setting_crop_images, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) |