1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-21 08:39:44 +00:00
mastodon/spec/policies
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
..
account_moderation_note_policy_spec.rb Add specs for AccountModerationNotePolicy () 2018-12-19 07:24:03 +01:00
account_policy_spec.rb Add specs for AccountPolicy () 2018-12-19 08:56:59 +01:00
backup_policy_spec.rb Add specs for BackupPolicy () 2018-12-19 18:24:15 +01:00
custom_emoji_policy_spec.rb Add specs for CustomEmojiPolicy () 2018-12-20 03:24:28 +01:00
domain_block_policy_spec.rb Add specs for DomainBlockPolicy () 2018-12-20 03:47:51 +01:00
email_domain_block_policy_spec.rb Add specs for EmailDomainBlockPolicy () 2018-12-20 03:51:41 +01:00
instance_policy_spec.rb Redesign admin instances area () 2019-01-08 13:39:49 +01:00
invite_policy_spec.rb Add specs for InvitePolicy () 2018-12-20 04:23:09 +01:00
relay_policy_spec.rb Add specs for policies () 2018-12-20 17:52:07 +01:00
report_note_policy_spec.rb Add specs for ReportNotePolicy () 2018-12-20 17:52:18 +01:00
report_policy_spec.rb Add specs for policies () 2018-12-20 17:52:07 +01:00
settings_policy_spec.rb Add specs for policies () 2018-12-20 17:52:07 +01:00
status_policy_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-19 12:58:49 +01:00
subscription_policy_spec.rb Add specs for policies () 2018-12-20 17:52:07 +01:00
tag_policy_spec.rb Add specs for policies () 2018-12-20 17:52:07 +01:00
user_policy_spec.rb Add specs for UserPolicy () 2018-12-20 17:51:55 +01:00