luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 04:13:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/policies
History
Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/admin/base_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/javascript/mastodon/initial_state.js`:
  Minor conflict caused by glitch-soc making use of max_toot_chars.
- `app/models/form/admin_settings.rb`:
  Minor conflict caused by glitch-soc's theming system.
- `app/models/trends.rb`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `app/views/admin/accounts/index.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/admin/instances/show.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/layouts/application.html.haml`:
  Minor conflict caused by glitch-soc's theming system.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Minor conflict caused by glitch-soc having more granular
  notification settings for trends.
- `config/navigation.rb`:
  Minor conflict caused by glitch-soc having additional
  navigation items for the theming system while upstream
  slightly changed every line.
2022-07-05 09:33:44 +02:00
..
account_moderation_note_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
account_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
backup_policy_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
custom_emoji_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
domain_block_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
email_domain_block_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
instance_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
invite_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
relay_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
report_note_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
report_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
settings_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
status_policy_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
tag_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
user_policy_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00