You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/models/form
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
6 years ago
..
account_batch.rb Add batch actions for approving and rejecting pending accounts (#10469) 6 years ago
admin_settings.rb Add site-wide options to show reblogs and replies in local/public timelines 6 years ago
delete_confirmation.rb Account deletion (#3728) 8 years ago
migration.rb Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 7 years ago
status_batch.rb Record deleted(by mod) status to prevent re-appear (#10732) 6 years ago
two_factor_confirmation.rb Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) 8 years ago