mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/views/admin
History
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 		2024-12-25 18:01:37 +01:00
..
account_actions Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899) 2024-09-13 09:11:10 +00:00
account_warnings Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
accounts Fix recently-broken admin interface buttons (#32240) 2024-10-03 16:12:15 +00:00
action_logs Move admin action log type list generation to helper (#32178) 2024-10-02 14:47:00 +00:00
announcements Use `async_count` in more view locations (#32086) 2024-10-04 12:29:43 +00:00
change_emails
…
custom_emojis Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 2024-08-08 19:30:16 +02:00
dashboard Fix: prevent linking to pages which require extra permissions (#32843) 2024-11-12 08:55:17 +00:00
disputes/appeals Use `async_count` in more view locations (#32086) 2024-10-04 12:29:43 +00:00
domain_allows
…
domain_blocks Use shared `form` partial for `admin/domain_blocks` views (#29609) 2024-04-22 12:22:16 +00:00
email_domain_blocks Add `DomainResource` class to wrap MX lookup/normalize (#32864) 2024-11-14 13:47:29 +00:00
export_domain_allows Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
export_domain_blocks Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
follow_recommendations Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +00:00
instances Fix: prevent linking to pages which require extra permissions (#32843) 2024-11-12 08:55:17 +00:00
invites Convert `admin/invites` controller specs to system specs (#32450) 2024-10-15 14:27:46 +00:00
ip_blocks Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
relationships Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
relays Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
report_notes Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
reports Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
roles Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
rules Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
settings Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
software_updates
…
status_edits Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
statuses Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
tags Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
terms_of_service Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
trends Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
users/roles Add link to `/admin/roles` in moderation interface when changing someone's role (#31791) 2024-09-06 17:21:49 +00:00
warning_presets Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
webhooks Wrap webhook event label with `samp` tag (#32115) 2024-09-27 08:20:21 +00:00