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.		2018-06-02 16:15:36 -05:00
..
activitypub	Exclude unlisted, private and direct toots from affecting trends (#7686)	2018-05-31 16:47:28 +02:00
ostatus	Fix N+1 on AtomSerializer (#7669)	2018-05-29 13:34:02 +02:00
settings	Refactor Setting (#3302)	2017-05-25 14:14:36 +02:00
activity_tracker.rb	Fix stats expiring too quickly because of variable mistake (#6155)	2018-01-02 14:02:53 +01:00
application_extension.rb	Conditional validations no longer accept strings for if/unless (#3124)	2017-05-19 03:11:23 +02:00
delivery_failure_tracker.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	2017-09-29 03:16:20 +02:00
entity_cache.rb	Fix missing updated_at attribute on emoji EntityCache (#7297)	2018-04-30 22:49:33 +02:00
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	2018-04-23 09:16:38 +02:00
extractor.rb	Using double splat operator (#5859)	2017-12-06 11:41:57 +01:00
fast_geometry_parser.rb	Fix avatar and header issues by using custom geometry detector (#6515)	2018-02-21 03:40:12 +01:00
feed_manager.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
formatter.rb	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
frontmatter_handler.rb	Remove ignored 'u' parameter on regexp (#392)	2018-03-27 11:30:49 -04:00
hash_object.rb
inline_renderer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
language_detector.rb	Improve language filter (#5724)	2017-11-16 13:51:38 +01:00
request.rb	User agent for WebFinger (#7531)	2018-05-18 01:47:22 +02:00
rss_builder.rb	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
sanitize_config.rb	[!] Sanitize incoming classlist properly (#6162)	2018-01-03 03:54:08 +01:00
sidekiq_error_handler.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	2018-02-24 19:16:11 +01:00
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	2018-05-03 10:41:58 +02:00
status_finder.rb	Raise an error for remote url in StatusFinder (#4776)	2017-09-02 17:42:47 +02:00
tag_manager.rb	Introduce OStatus::TagManager (#5008)	2017-09-19 18:08:08 +02:00
themes.rb	Screenshot support for themes	2017-12-10 20:32:28 -08:00
user_settings_decorator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
webfinger_resource.rb