mastodon/app/controllers/concerns
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
access_token_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
account_controller_concern.rb Add ActivityPub secure mode (#11269) 2019-07-11 20:11:09 +02:00
account_owned_concern.rb Change public profile pages to be disabled for unconfirmed users (#17385) 2022-01-28 14:24:37 +01:00
accountable_concern.rb Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
admin_export_controller_concern.rb Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
authorization.rb Bump pundit from 2.1.1 to 2.2.0 (#17543) 2022-02-19 13:30:06 +09:00
cache_concern.rb Fix cache_collection crashing when given an empty collection (#15921) 2021-03-18 00:41:32 +01:00
captcha_concern.rb Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
challengable_concern.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
export_controller_concern.rb Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
localized.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
rate_limit_headers.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
registration_spam_concern.rb Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
session_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
signature_authentication.rb
signature_verification.rb Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
status_controller_concern.rb Refactor controllers for statuses, accounts, and more (#11249) 2019-07-08 12:03:45 +02:00
theming_concern.rb Add support for multiple source files per pack 2022-02-12 00:10:28 +01:00
two_factor_authentication_concern.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
user_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00