You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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).		6 years ago
..
activitypub	Implement Undo { Accept { Follow } } (fixes #8234) (#8245)	6 years ago
ostatus	Append '.test' to hostname in stub data (#7260)	6 years ago
settings	…
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	Migrate glitch-soc keyword mutes to Mastodon's	6 years ago
formatter_spec.rb	Append '.test' to hostname in stub data (#7260)	6 years ago
hash_object_spec.rb	…
language_detector_spec.rb	Disable language detection for texts shorter than 140 characters (#8010)	6 years ago
request_spec.rb	Validate HTTP response length while receiving (#6891)	6 years ago
status_filter_spec.rb	…
status_finder_spec.rb	Add tests for embeds controller (#7719)	6 years ago
tag_manager_spec.rb	Append '.test' to hostname in stub data (#7260)	6 years ago
user_settings_decorator_spec.rb	Enable updating additional account information from user preferences via rest api (#6789)	6 years ago
webfinger_resource_spec.rb	…