monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views/admin
History
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
 		2023-12-20 22:16:50 +01:00
..
account_actions Extract helper methods for form label in admin/ area views (#27575) 2023-11-29 10:06:19 +00:00
account_warnings Fix crash when viewing a moderation appeal and the moderator account has been deleted (#25900) 2023-09-18 17:41:32 +02:00
accounts Add `Account#unavailable?` and `Account#permanently_unavailable?` aliases (#28053) 2023-11-30 15:43:26 +00:00
action_logs Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
announcements Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
change_emails Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
custom_emojis Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream 2023-12-19 21:24:01 +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 Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00
email_domain_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
export_domain_allows Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
export_domain_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
follow_recommendations Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
instances Add support for displaying unknown servers on /admin/instances/:domain (#27150) 2023-10-23 14:27:57 +02:00
invites Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
ip_blocks Extract helper methods for form label in admin/ area views (#27575) 2023-11-29 10:06:19 +00:00
relationships Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01: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 `Style/HashEachMethods` cop in HAML files (#28178) 2023-12-04 09:09:43 +00:00
roles Refactor, lint fix, and bug fix on admin/roles/form partial (#27558) 2023-11-29 10:00:52 +00:00
rules Fix haml-lint `UnnecessaryStringOutput` for views (#27531) 2023-10-25 12:01:00 +00:00
settings Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +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 Use helper method to build batched status edits in `admin/statuses/show` (#27739) 2023-11-08 13:04:52 +00:00
tags Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00
trends Solve simplest haml-lint `Rubocop` lints (#27529) 2023-10-25 12:38:01 +00:00
users/roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
warning_presets Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
webhooks Fix haml-lint `InstanceVariables` rule for admin/webhooks/_form (#26062) 2023-09-28 16:23:35 +02:00