mastodon/app/lib
Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb
2019-10-27 12:14:01 +01:00
..
activitypub Allow Accept/Reject with a non-embedded object (#12199) 2019-10-24 22:45:43 +02:00
connection_pool
nodeinfo Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
ostatus
proof_provider
settings
activity_tracker.rb Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02:00
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
formatter.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
hash_object.rb
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb
request.rb
request_pool.rb
rss_builder.rb Add RSS feeds for end-users (#7259) 2018-04-25 02:10:02 +02:00
sanitize_config.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
search_query_parser.rb
search_query_transformer.rb
sidekiq_error_handler.rb
spam_check.rb Fix auto-report string saying the account has been auto-silenced (#12142) 2019-10-10 18:47:24 +02:00
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
toc_generator.rb
user_settings_decorator.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
webfinger_resource.rb