Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml

2018-08-31 19:10:57 +02:00

..

activitypub

Display pending message on admin relays UI (#8494)

2018-08-28 05:39:43 +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

Fix autoplay issue with spoiler tag (#8540)

2018-08-31 15:16:59 +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

…