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
..
account_moderation_note_policy_spec.rb	…
account_policy_spec.rb	…
backup_policy_spec.rb	…
custom_emoji_policy_spec.rb	…
domain_block_policy_spec.rb	…
email_domain_block_policy_spec.rb	…
instance_policy_spec.rb	…
invite_policy_spec.rb	…
relay_policy_spec.rb	…
report_note_policy_spec.rb	…
report_policy_spec.rb	…
settings_policy_spec.rb	…
status_policy_spec.rb	…
subscription_policy_spec.rb	…
tag_policy_spec.rb	…
user_policy_spec.rb	…