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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
activitypub	Add ActivityPub secure mode (#11269)	6 years ago
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
auth	Fix sign-ups without checked user agreement being accepted through the web form (#13088)	5 years ago
concerns	Change signature verification to ignore signatures with invalid host (#13033)	5 years ago
oauth	Add force_login option to OAuth authorize page (#8655)	6 years ago
settings	Merge branch 'master' into glitch-soc/master	5 years ago
well_known	Add a nodeinfo endpoint (#12002)	5 years ago
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
account_follow_controller_spec.rb	Add specific rate limits for posting and following (#13172)	5 years ago
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
application_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
authorize_interactions_controller_spec.rb	Optimize the process of following someone (#9220)	6 years ago
emojis_controller_spec.rb	Misc. typos (#8694)	6 years ago
follower_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
following_accounts_controller_spec.rb	Hide blocked users from more places (#12733)	5 years ago
health_check_controller_spec.rb	Add test for health_check endpoint	5 years ago
home_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	5 years ago
intents_controller_spec.rb	Add remote interaction dialog for toots (#8202)	6 years ago
invites_controller_spec.rb	Lint pass (#8876)	6 years ago
manifests_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
media_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
relationships_controller_spec.rb	Add relationship manager UI (#10268)	6 years ago
remote_follow_controller_spec.rb	Fix uncaught domain normalization error in remote follow (#11703)	5 years ago
remote_interaction_controller_spec.rb	Add specs for RemoteInteractionController (#9524)	6 years ago
shares_controller_spec.rb	Fix blurhash and autoplay not working on public pages (#11585)	5 years ago
statuses_controller_spec.rb	Refactor controllers for statuses, accounts, and more (#11249)	6 years ago
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	6 years ago