mastodon-glitch/app/controllers/concerns
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +01:00
..
access_token_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
account_controller_concern.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +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 Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01: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 Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09: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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
signature_authentication.rb
signature_verification.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01: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 2023-02-25 14:00:40 +01:00
user_tracking_concern.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01:00
web_app_controller_concern.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-01-10 09:39:15 +01:00