Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
activitypub
ostatus
proof_provider
settings
activity_tracker.rb	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
application_extension.rb
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
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb
formatter.rb
hash_object.rb	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings	2017-01-12 20:46:24 +01:00
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb
request.rb
rss_builder.rb	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
sanitize_config.rb
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
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	Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)	2017-04-23 14:19:54 +02:00