David Yip 813da6788e Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	db/schema.rb

2018-04-14 09:12:50 -05:00

..

activitypub

Add bio fields (#6645)

2018-04-14 12:41:08 +02:00

ostatus

[WIP] Enable custom emoji on account pages and in the sidebar (#6124)

2018-04-01 23:55:42 +02:00

settings

…

activity_tracker.rb

…

application_extension.rb

…

delivery_failure_tracker.rb

…

exceptions.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

extractor.rb

…

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 'tootsuite/master' into glitchsoc/master

2018-02-24 05:17:10 +00:00

formatter.rb

Add bio fields (#6645)

2018-04-14 12:41:08 +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

…

language_detector.rb

…

provider_discovery.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

request.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +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

Full-text search for authorized statuses (#6423)

2018-02-09 23:04:47 +01:00

status_finder.rb

…

tag_manager.rb

…

themes.rb

…

user_settings_decorator.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-08 19:05:02 -05:00

webfinger_resource.rb

…