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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 years ago
..
activitypub	Add ActivityPub secure mode (#11269)	5 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	Change unconfirmed user login behaviour (#11375)	5 years ago
concerns	Change locale detection to run once per session (#8657)	5 years ago
oauth	Add force_login option to OAuth authorize page (#8655)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
well_known	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
account_follow_controller_spec.rb	Cover AccountFollowController more in spec (#3227)	8 years ago
account_unfollow_controller_spec.rb	Cover AccountUnfollowController more in spec (#3228)	8 years ago
accounts_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 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	Add tests for followers_accounts_controller (#7794)	7 years ago
following_accounts_controller_spec.rb	Add tests for following accounts controller (#7800)	7 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)	5 years ago
tags_controller_spec.rb	Redesign public hashtag page to use a masonry layout (#9822)	6 years ago