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 a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		4 years ago
..
activitypub	Fix RSS feeds not being cachable (#14368)	4 years ago
admin	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
auth	Change account suspensions to be reversible by default (#14726)	4 years ago
concerns	Change account suspensions to be reversible by default (#14726)	4 years ago
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
well_known	Fix webfinger returning wrong status code on malformed or missing param (#13759)	5 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Do not serve account actors at all in limited federation mode (#14800)	4 years ago
application_controller_spec.rb	…
authorize_interactions_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	…
following_accounts_controller_spec.rb	…
health_check_controller_spec.rb	…
home_controller_spec.rb	…
intents_controller_spec.rb	…
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
media_proxy_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
relationships_controller_spec.rb	…
remote_follow_controller_spec.rb	Refactor monkey-patching of Goldfinger (#12561)	5 years ago
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	Fix RSS feeds not being cachable (#14368)	4 years ago
tags_controller_spec.rb	…