tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/views/admin
History
Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
2024-05-16 19:30:10 +02:00
..
account_actions
Fix haml-lint LineLength cops in app/views/admin (#28680)
2024-03-15 11:19:00 +00:00
account_warnings
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
accounts
Improve Report Notes and Account Moderation Notes (#30288)
2024-05-15 13:38:36 +00:00
action_logs
Fix LineLength haml-lint in t usage (#28686)
2024-01-11 09:32:32 +00:00
announcements
Use shared form partial for admin/announcements views (#29608)
2024-04-19 13:57:32 +00:00
change_emails
…
custom_emojis
Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream
2024-05-04 14:59:00 +02:00
dashboard
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
disputes/appeals
Refactor appeal partial to avoid brakeman XSS warning (#25880)
2023-10-19 17:25:54 +02:00
domain_allows
Consolidate inclusion of admin js pack link (#26628)
2023-08-24 09:56:23 +02:00
domain_blocks
Use shared form partial for admin/domain_blocks views (#29609)
2024-04-22 12:22:16 +00:00
email_domain_blocks
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +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
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
follow_recommendations
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
instances
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
invites
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
ip_blocks
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
relationships
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
relays
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
report_notes
…
reports
Improve Report Notes and Account Moderation Notes (#30288)
2024-05-15 13:38:36 +00:00
roles
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
rules
Use shared form partial for admin/rules views (#30067)
2024-04-29 09:33:27 +00:00
settings
Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
2024-05-06 17:53:51 +02:00
software_updates
Solve simplest haml-lint Rubocop lints (#27529)
2023-10-25 12:38:01 +00:00
status_edits
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
statuses
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
tags
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
trends
Add material design icons to admin/settings views (#27780)
2024-04-23 16:43:49 +00:00
users/roles
Fix haml-lint LineLength cops in app/views/admin (#28680)
2024-03-15 11:19:00 +00:00
warning_presets
Use shared form partial for admin/warning_presets views (#30069)
2024-04-29 09:33:06 +00:00
webhooks
Use shorter render call in admin/webhooks view (#30071)
2024-04-29 09:10:23 +00:00