Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb

2019-03-13 15:16:02 +01:00

..

activitypub

Fix poll update handler calling method was that was not available (#10246)

2019-03-12 22:58:59 +01:00

ostatus

…

settings

…

activity_tracker.rb

…

application_extension.rb

…

delivery_failure_tracker.rb

…

entity_cache.rb

…

exceptions.rb

…

extractor.rb

…

fast_geometry_parser.rb

…

feed_manager.rb

…

formatter.rb

Fix newlines in OStatus and RSS serializations (#10183)

2019-03-05 23:58:58 +01:00

hash_object.rb

…

inline_renderer.rb

…

language_detector.rb

…

potential_friendship_tracker.rb

…

request.rb

Increase DNS timeouts (#10238)

2019-03-11 13:27:57 +01:00

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

…