mastodon/app/lib
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml
2018-03-02 21:46:44 -06:00
..
activitypub Fix #5708: Reject->Follow will remove the follow if it exists (#6571) 2018-02-28 06:55:06 +01:00
ostatus Push discovered status through streaming API within a time window (#6484) 2018-02-17 14:28:48 +01:00
settings
activity_tracker.rb Fix stats expiring too quickly because of variable mistake (#6155) 2018-01-02 14:02:53 +01:00
application_extension.rb
delivery_failure_tracker.rb
exceptions.rb Raise Mastodon::HostValidationError when host for HTTP request is private (#6410) 2018-02-24 19:16:11 +01: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 'tootsuite/master' into glitchsoc/master 2018-02-24 05:17:10 +00:00
formatter.rb Don't normalize URLs in toots (#6134) 2018-01-03 20:51:33 +01:00
frontmatter_handler.rb remove escapes from server-side γaml handler 2018-01-24 14:23:25 +01:00
hash_object.rb
inline_renderer.rb
language_detector.rb Improve language filter (#5724) 2017-11-16 13:51:38 +01:00
provider_discovery.rb Fix XML oEmbed support discovery (#6104) 2017-12-27 03:29:49 +01:00
request.rb Raise Mastodon::HostValidationError when host for HTTP request is private (#6410) 2018-02-24 19:16:11 +01: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 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-02-09 09:25:53 -06:00
webfinger_resource.rb