luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 12:24:31 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/models/form
History
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
..
account_batch.rb Add batch suspend for accounts in admin UI (#17009) 2021-12-05 21:48:39 +01:00
admin_settings.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
challenge.rb
custom_emoji_batch.rb
delete_confirmation.rb
ip_block_batch.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
preview_card_batch.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
preview_card_provider_batch.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
redirect.rb Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00
status_batch.rb
tag_batch.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
two_factor_confirmation.rb