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	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	6 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	Create Redisable#redis (#9633)	6 years ago
application_extension.rb	Conditional validations no longer accept strings for if/unless (#3124)	8 years ago
delivery_failure_tracker.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	7 years ago
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	6 years ago
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	7 years ago
extractor.rb	Using double splat operator (#5859)	7 years ago
fast_geometry_parser.rb	Fix avatar and header issues by using custom geometry detector (#6515)	7 years ago
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	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings	8 years ago
inline_renderer.rb	Add conversations API (#8832)	6 years ago
language_detector.rb	Change language detection to include hashtags as words (#11341)	6 years ago
potential_friendship_tracker.rb	Create Redisable#redis (#9633)	6 years ago
proof_provider.rb	Add Keybase integration (#10297)	6 years ago
request.rb	Attempt to concurrently connect to remote IP addresses (#11757)	5 years ago
request_pool.rb	Add request pool to improve delivery performance (#10353)	6 years ago
rss_builder.rb	Add RSS feeds for end-users (#7259)	7 years ago
sanitize_config.rb	Add support for <sup> formatting element	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 accounts search by full/partial display name and others (#11580)	5 years ago
sidekiq_error_handler.rb	Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230)	6 years ago
spam_check.rb	Add setting to disable the anti-spam (#11296)	6 years ago
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	7 years ago
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	Allow selecting both default flavour and theme	6 years ago
user_settings_decorator.rb	Add option to disable emoji replacements	5 years ago
webfinger_resource.rb	Add ActivityPub actor representing the entire server (#11321)	6 years ago