Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		2018-08-17 17:43:54 +02:00
..
activitypub
ostatus
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	Conditional validations no longer accept strings for if/unless (#3124)	2017-05-19 03:11:23 +02:00
delivery_failure_tracker.rb
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
request.rb
rss_builder.rb
sanitize_config.rb
sidekiq_error_handler.rb
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
user_settings_decorator.rb
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