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
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
apps	…
instances	Add specs for Api::V1::Instances::PeersController (#9546)	6 years ago
lists	…
push	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
timelines	Add scheduled statuses (#9706)	6 years ago
accounts_controller_spec.rb	Add REST API for creating an account (#9572)	6 years ago
apps_controller_spec.rb	…
blocks_controller_spec.rb	…
bookmarks_controller_spec.rb	…
conversations_controller_spec.rb	Add scheduled statuses (#9706)	6 years ago
custom_emojis_controller_spec.rb	…
domain_blocks_controller_spec.rb	…
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	6 years ago
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
filter_controller_spec.rb	…
follow_requests_controller_spec.rb	…
follows_controller_spec.rb	…
instances_controller_spec.rb	…
lists_controller_spec.rb	…
media_controller_spec.rb	Not to skip executable specs (#9753)	6 years ago
mutes_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
notifications_controller_spec.rb	Add scheduled statuses (#9706)	6 years ago
reports_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
search_controller_spec.rb	…
statuses_controller_spec.rb	…
streaming_controller_spec.rb	Lint pass (#8876)	6 years ago
suggestions_controller_spec.rb	…