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.

David Yip 3550470c18 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.		7 years ago
..
activitypub	Exclude unlisted, private and direct toots from affecting trends (#7686)	7 years ago
ostatus	Fix N+1 on AtomSerializer (#7669)	7 years ago
settings	Refactor Setting (#3302)	8 years ago
activity_tracker.rb	Fix stats expiring too quickly because of variable mistake (#6155)	7 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	Fix missing updated_at attribute on emoji EntityCache (#7297)	7 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 remote-tracking branch 'origin/master' into gs-master	7 years ago
formatter.rb	Enable custom emojis in profiles (notes, field values, display names) (#7374)	7 years ago
frontmatter_handler.rb	Remove ignored 'u' parameter on regexp (#392)	7 years ago
hash_object.rb	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings	8 years ago
inline_renderer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	8 years ago
language_detector.rb	Improve language filter (#5724)	7 years ago
request.rb	User agent for WebFinger (#7531)	7 years ago
rss_builder.rb	Add RSS feeds for end-users (#7259)	7 years ago
sanitize_config.rb	[!] Sanitize incoming classlist properly (#6162)	7 years ago
sidekiq_error_handler.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	7 years ago
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	7 years ago
status_finder.rb	Raise an error for remote url in StatusFinder (#4776)	7 years ago
tag_manager.rb	Introduce OStatus::TagManager (#5008)	7 years ago
themes.rb	Screenshot support for themes	7 years ago
user_settings_decorator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
webfinger_resource.rb	Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)	8 years ago