You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	rubocop issues - Cleaning up (#8912)	6 years ago
fixtures	Ignore low-confidence CharlockHolmes guesses when parsing link cards (#9510)	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	Improve e-mail digest (#9689)	6 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
presenters	Change instance_presenter_spec to point to glitch-soc instead of tootsuite	6 years ago
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Add scheduled statuses (#9706)	6 years ago
rails_helper.rb	rubocop issues - Cleaning up (#8912)	6 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago