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
..
accept.rb	Allow Accept/Reject with a non-embedded object (#12199)	5 years ago
add.rb	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	7 years ago
announce.rb	Add support for inlined objects in activity audience (#14514)	4 years ago
block.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
create.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
delete.rb	Change account suspensions to be reversible by default (#14726)	4 years ago
flag.rb	Change domain blocks to automatically support subdomains (#11138)	5 years ago
follow.rb	Add option to be notified when a followed user posts (#13546)	4 years ago
like.rb	Add option to be notified when a followed user posts (#13546)	4 years ago
move.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
reject.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	4 years ago
remove.rb	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	7 years ago
undo.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
update.rb	Dereference object URIs in Create and Update messages (#14359)	4 years ago