monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views/admin
History
Claire 2d4ff8f6ed Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Upstream split some `simple_form` arguments across multiple lines.
  One of the arguments in glitch-soc was different.
  Split as upstream's did, keeping our different limit argument.
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream split some `simple_form` arguments across multiple lines.
  Glitch-soc had a different field because of the different theming
  system.
  Kept glitch-soc's definition of that form field.
 		2024-03-15 12:43:59 +01:00
..
account_actions Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
account_warnings Fix `LineLength` haml-lint in `t` usage (#28686) 2024-01-11 09:32:32 +00:00
accounts Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
action_logs Fix `LineLength` haml-lint in `t` usage (#28686) 2024-01-11 09:32:32 +00:00
announcements Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
change_emails Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
custom_emojis Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream 2024-03-15 12:43:59 +01:00
dashboard Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02: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 Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
email_domain_blocks Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +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 Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
follow_recommendations Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
instances Show comments in the admin/instances page (#29240) 2024-02-28 12:07:06 +00:00
invites Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
ip_blocks Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
relationships Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
relays Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 2023-10-25 12:01:00 +00:00
report_notes Change account moderation notes to make links clickable (#22553) 2023-01-18 16:32:23 +01:00
reports Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
roles Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
rules Add hints for rules (#29539) 2024-03-11 08:57:07 +00:00
settings Merge commit 'f445d33fd6aa492df319f4cc4efbd255d7a84f0e' into glitch-soc/merge-upstream 2024-03-15 12:43:59 +01:00
software_updates Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00
status_edits Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
statuses Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
tags Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00
trends Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
users/roles Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00
warning_presets Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
webhooks Fix haml-lint `LineLength` cops in app/views/admin (#28680) 2024-03-15 11:19:00 +00:00