Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
admin	Add specs for Admin::AccountModerationNotesHelper (#9455)	2018-12-07 16:39:20 +01:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
application_helper_spec.rb	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
flashes_helper_spec.rb
home_helper_spec.rb
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
jsonld_helper_spec.rb	Add pending specs for jsonld helper (#9750)	2019-01-08 12:18:27 +09:00
routing_helper_spec.rb
settings_helper_spec.rb
stream_entries_helper_spec.rb	Display full acct on public status pages, always (#8011)	2018-07-14 04:07:47 +02:00