Mastodon

Files

Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.

2020-01-04 23:04:42 +01:00

account_actions

Add option to include reported statuses in warning e-mail (#11639 )

2019-08-23 22:37:23 +02:00

account_moderation_notes

…

account_warnings

…

accounts

Add link to search for users connected from the same IP address (#12157 )

2019-10-24 22:49:26 +02:00

action_logs

…

change_emails

…

custom_emojis

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

2019-10-10 17:26:08 +02:00

dashboard

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

2019-09-30 12:23:57 +02:00

domain_allows

Fix upstream changes breaking because of glitch-soc's theming engine

2019-09-13 20:28:22 +02:00

domain_blocks

…

email_domain_blocks

…

followers

…

instances

Link to reports targetting instance in admin view (#12513 )

2019-12-01 19:03:43 +01:00

invites

…

pending_accounts

…

relays

…

report_notes

…

reports

Merge branch 'master' into glitch-soc/master

2019-12-19 13:52:54 +01:00

settings

Fix issue because of theming system

2019-12-19 14:42:16 +01:00

statuses

…