mastodon/app/lib
Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
..
activitypub Add CLI task for rotating keys (#8466) 2018-08-26 20:21:03 +02:00
ostatus Improve federated ID validation (#8372) 2018-08-22 20:55:14 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
activity_tracker.rb
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
extractor.rb
fast_geometry_parser.rb
feed_manager.rb Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +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
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 Fix activity:interactions counter to count all interactions (#8037) 2018-07-16 18:35:43 +02:00
request.rb Add CLI task for rotating keys (#8466) 2018-08-26 20:21:03 +02:00
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
status_filter.rb Fix n+1 queries in StatusThreadingConcern (#7321) 2018-05-03 10:41:58 +02:00
status_finder.rb
tag_manager.rb
themes.rb
user_settings_decorator.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-06-21 20:49:57 +02:00
webfinger_resource.rb