Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +02:00
..
activitypub
ostatus
settings	Refactor Setting (#3302)	2017-05-25 14:14:36 +02:00
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
entity_cache.rb	Fix missing updated_at attribute on emoji EntityCache (#7297)	2018-04-30 22:49:33 +02:00
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	2018-04-23 09:16:38 +02:00
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Make whole-word filter regex consistent between Ruby and JS (#7987)	2018-07-10 03:01:50 +02:00
formatter.rb	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
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	Disable language detection for texts shorter than 140 characters (#8010)	2018-07-14 04:05:36 +02:00
potential_friendship_tracker.rb
request.rb
rss_builder.rb	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
sanitize_config.rb	Whitelist dat/ipfs/gopher links in sanitizer (#8034)	2018-07-16 22:17:43 +09: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
status_finder.rb
tag_manager.rb
themes.rb	Screenshot support for themes	2017-12-10 20:32:28 -08:00
user_settings_decorator.rb
webfinger_resource.rb