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).

2018-08-17 17:43:54 +02:00

..

activitypub

Implement Undo { Accept { Follow } } (fixes #8234) (#8245)

2018-08-17 16:24:56 +02:00

ostatus

Append '.test' to hostname in stub data (#7260)

2018-04-25 14:12:28 +02:00

settings

…

delivery_failure_tracker_spec.rb

…

extractor_spec.rb

…

feed_manager_spec.rb

Migrate glitch-soc keyword mutes to Mastodon's

2018-07-09 19:19:23 +02:00

formatter_spec.rb

Append '.test' to hostname in stub data (#7260)

2018-04-25 14:12:28 +02:00

hash_object_spec.rb

…

language_detector_spec.rb

Disable language detection for texts shorter than 140 characters (#8010)

2018-07-14 04:05:36 +02:00

request_spec.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

status_filter_spec.rb

…

status_finder_spec.rb

Add tests for embeds controller (#7719)

2018-06-04 10:35:56 +09:00

tag_manager_spec.rb

Append '.test' to hostname in stub data (#7260)

2018-04-25 14:12:28 +02:00

user_settings_decorator_spec.rb

Enable updating additional account information from user preferences via rest api (#6789)

2018-04-08 13:43:10 +02:00

webfinger_resource_spec.rb

…