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
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
v2	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
web	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
base_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
oembed_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
push_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
salmon_controller_spec.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
subscriptions_controller_spec.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00