f224237862
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| connection_pool | ||
| ostatus | ||
| rss | ||
| settings | ||
| delivery_failure_tracker_spec.rb | ||
| entity_cache_spec.rb | ||
| extractor_spec.rb | ||
| fast_ip_map_spec.rb | ||
| feed_manager_spec.rb | ||
| formatter_spec.rb | ||
| hash_object_spec.rb | ||
| link_details_extractor_spec.rb | ||
| permalink_redirector_spec.rb | ||
| request_pool_spec.rb | ||
| request_spec.rb | ||
| sanitize_config_spec.rb | ||
| status_filter_spec.rb | ||
| status_finder_spec.rb | ||
| status_reach_finder_spec.rb | ||
| tag_manager_spec.rb | ||
| user_settings_decorator_spec.rb | ||
| webfinger_resource_spec.rb | ||