This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/models/form
Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05 14:16:25 +01:00
..
account_batch.rb Change batch account suspension to create a strike (#20897) 2022-11-17 10:52:51 +01:00
admin_settings.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
challenge.rb
custom_emoji_batch.rb
delete_confirmation.rb
domain_block_batch.rb Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
email_domain_block_batch.rb
ip_block_batch.rb
redirect.rb Fix 500 error when trying to migrate to an invalid address (#21462) 2022-12-07 02:35:39 +01:00
status_filter_batch_action.rb Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
two_factor_confirmation.rb