You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		5 years ago
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	…
action_logs	…
announcements	…
change_emails	…
custom_emojis	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dashboard	…
domain_allows	…
domain_blocks	…
email_domain_blocks	…
instances	Put “Add new domain block” button on /admin/instances in header (#13934)	5 years ago
invites	…
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
relationships	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Add support for setting Content Warning for CW-less outgoing toots	5 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
warning_presets	…