Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		2019-06-24 15:02:59 +02:00
..
activitypub	Fix audio not being downloaded from remote servers (#11145)	2019-06-22 02:50:36 +02:00
ostatus	Change domain blocks to automatically support subdomains (#11138)	2019-06-22 00:13:10 +02:00
proof_provider	Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)	2019-04-21 04:53:24 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
activity_tracker.rb	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	2018-11-16 15:02:18 +01: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 branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
formatter.rb	Fix rendering of emoji in public pages	2019-06-18 20:14:08 +02:00
hash_object.rb	…
inline_renderer.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
language_detector.rb	Change language detector threshold from 140 characters to 4 words (#10376)	2019-03-26 01:23:59 +01:00
potential_friendship_tracker.rb	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
proof_provider.rb	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
request.rb	Increase DNS timeouts (#10238)	2019-03-11 13:27:57 +01:00
rss_builder.rb	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
sanitize_config.rb	Fix sanitizer making block level elements unreadable (#10836)	2019-06-16 21:46:36 +02: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	…
tag_manager.rb	…
themes.rb	Allow selecting both default flavour and theme	2018-10-12 19:06:35 +02:00
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-26 15:41:40 +02:00
webfinger_resource.rb	…