Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
activitypub	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
ostatus	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
settings	Add a test for Settings::Extend#settings (#5720)	2017-11-19 04:15:32 +01:00
delivery_failure_tracker_spec.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	2017-09-29 03:16:20 +02:00
extractor_spec.rb	Spec Extractor (#3540)	2017-06-04 14:57:02 +02:00
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
formatter_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
hash_object_spec.rb	Spec HashObject (#3544)	2017-06-04 14:59:52 +02:00
language_detector_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
request_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
status_filter_spec.rb	Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)	2017-06-15 02:00:08 +02:00
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	Fix randomly fail (regression from #3560) (#3580)	2017-06-05 10:03:36 +02:00