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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
7 years ago
..
admin_settings.rb Add admin setting to disable followers count 7 years ago
delete_confirmation.rb Account deletion (#3728) 9 years ago
migration.rb Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 8 years ago
status_batch.rb Remove Form::StatusBatch::ACTION_TYPE unused (#9623) 7 years ago
two_factor_confirmation.rb Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) 9 years ago