You cannot 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.		6 years ago
..
activitypub	Add E2EE API (#13820)	6 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	7 years ago
nodeinfo	Add a nodeinfo endpoint (#12002)	6 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	7 years ago
proof_provider	Fix keybase config serializer (#13742)	6 years ago
rss	Improve RSS entries for statuses (#13592)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
activity_tracker.rb	Add a nodeinfo endpoint (#12002)	6 years ago
application_extension.rb	…
delivery_failure_tracker.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	6 years ago
entity_cache.rb	Fix PostgreSQL load when linking in announcements (#13250)	6 years ago
exceptions.rb	Add specific rate limits for posting and following (#13172)	6 years ago
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
formatter.rb	Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”	6 years ago
hash_object.rb	…
inline_renderer.rb	Add E2EE API (#13820)	6 years ago
language_detector.rb	Bump cld3 from 3.2.6 to 3.3.0 (#13107)	6 years ago
potential_friendship_tracker.rb	…
proof_provider.rb	…
rate_limiter.rb	Add rate limit for reporting (#13390)	6 years ago
request.rb	Fix error within error when limiting backtrace to 3 lines (#13120)	6 years ago
request_pool.rb	Add request pool to improve delivery performance (#10353)	7 years ago
rss_builder.rb	…
sanitize_config.rb	Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334)	6 years ago
search_query_parser.rb	Fix accounts search by full/partial display name and others (#11580)	7 years ago
search_query_transformer.rb	Fix error when searching for empty phrase (#12711)	6 years ago
sidekiq_error_handler.rb	Fix error within error when limiting backtrace to 3 lines (#13120)	6 years ago
spam_check.rb	Exempt staff members from spam check (#12874)	6 years ago
status_filter.rb	…
status_finder.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	7 years ago
tag_manager.rb	Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334)	6 years ago
themes.rb	…
toc_generator.rb	Add fallback section ID with ToC (#11941)	7 years ago
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webfinger_resource.rb	Fix webfinger returning wrong status code on malformed or missing param (#13759)	6 years ago