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 5b8a4f96de Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.		4 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	5 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)	5 years ago
proof_provider	Fix rubocop warning (#14288)	4 years ago
rss	Improve RSS entries for statuses (#13592)	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
activity_tracker.rb	Add a nodeinfo endpoint (#12002)	5 years ago
application_extension.rb	Conditional validations no longer accept strings for if/unless (#3124)	8 years ago
delivery_failure_tracker.rb	Change delivery failure tracking to work with hostnames instead of URLs (#13437)	5 years ago
entity_cache.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
exceptions.rb	Fix movie width and frame_rate returning nil (#14357)	4 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	4 years ago
formatter.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 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 E2EE API (#13820)	5 years ago
language_detector.rb	Fix Thai being skipped from language detection (#13989)	4 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 rate limit for reporting (#13390)	5 years ago
request.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
request_pool.rb	Add request pool to improve delivery performance (#10353)	5 years ago
response_with_limit.rb	Fix remote files not using Content-Type header, streaming (#14184)	4 years ago
rss_builder.rb	Add RSS feeds for end-users (#7259)	7 years ago
sanitize_config.rb	Add support for li attribute to li element	4 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	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
spam_check.rb	Exempt staff members from spam check (#12874)	5 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)	5 years ago
tag_manager.rb	Fix exception when trying to serialize posts with <a> tags in them without hrefs (#1334)	5 years ago
themes.rb	Allow selecting both default flavour and theme	6 years ago
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	Fix webfinger returning wrong status code on malformed or missing param (#13759)	5 years ago