Mastodon

Files

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_actions

…

account_moderation_notes

…

account_warnings

…

accounts

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247 )

2019-07-07 16:16:51 +02:00

action_logs

Use local time in audit log (#10751 )

2019-05-11 06:46:01 +02:00

change_emails

…

custom_emojis

…

dashboard

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

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

domain_allows

Add whitelist mode (#11291 )

2019-07-30 11:10:46 +02:00

domain_blocks

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

2019-05-15 17:11:40 +02:00

email_domain_blocks

…

followers

…

instances

Add whitelist mode (#11291 )

2019-07-30 11:10:46 +02:00

invites

…

pending_accounts

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

2019-06-07 17:00:36 +02:00

relays

…

report_notes

…

reports

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

2019-07-19 18:26:49 +02:00

settings

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

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

statuses

…