This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/admin
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_actions
account_warnings
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
announcements
change_emails
custom_emojis Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
dashboard
disputes/appeals
domain_allows
domain_blocks
email_domain_blocks
export_domain_allows Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
export_domain_blocks Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
follow_recommendations
instances Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
invites
ip_blocks
relationships
relays
report_notes
reports
roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
rules
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
statuses
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
trends
users/roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
warning_presets
webhooks Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00