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 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		5 years ago
..
activitypub	Clarify keyword arguments with ** (#12769)	5 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	6 years ago
nodeinfo	Add a nodeinfo endpoint (#12002)	5 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
proof_provider	Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
activity_tracker.rb	Add a nodeinfo endpoint (#12002)	5 years ago
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	Add announcements (#12662)	5 years ago
exceptions.rb	Add specific rate limits for posting and following (#13172)	5 years ago
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
formatter.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
hash_object.rb	…
inline_renderer.rb	Add announcements (#12662)	5 years ago
language_detector.rb	Bump cld3 from 3.2.6 to 3.3.0 (#13107)	5 years ago
potential_friendship_tracker.rb	Create Redisable#redis (#9633)	6 years ago
proof_provider.rb	Add Keybase integration (#10297)	6 years ago
rate_limiter.rb	Add specific rate limits for posting and following (#13172)	5 years ago
request.rb	Fix Ruby 2.7 support (#12831)	5 years ago
request_pool.rb	Add request pool to improve delivery performance (#10353)	6 years ago
rss_builder.rb	…
sanitize_config.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
search_query_parser.rb	Fix accounts search by full/partial display name and others (#11580)	5 years ago
search_query_transformer.rb	Fix error when searching for empty phrase (#12711)	5 years ago
sidekiq_error_handler.rb	Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230)	6 years ago
spam_check.rb	Exempt staff members from spam check (#12874)	5 years ago
status_filter.rb	…
status_finder.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
tag_manager.rb	Refactor domain block checks (#11268)	6 years ago
themes.rb	…
toc_generator.rb	Add fallback section ID with ToC (#11941)	5 years ago
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webfinger_resource.rb	Add ActivityPub actor representing the entire server (#11321)	6 years ago