Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml

2019-08-07 13:56:48 +02:00

..

account_batch.rb

Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)

2019-06-04 23:11:18 +02:00

admin_settings.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-07 13:56:48 +02:00

delete_confirmation.rb

Account deletion (#3728)

2017-06-14 18:01:27 +02:00

migration.rb

Rename ResolveRemoteAccountService to ResolveAccountService (#6327)

2018-01-22 14:25:09 +01:00

status_batch.rb

Record deleted(by mod) status to prevent re-appear (#10732)

2019-05-09 22:03:02 +02:00

two_factor_confirmation.rb

Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)

2017-04-08 22:20:08 +02:00