Merge remote-tracking branch 'parent/main' into upstream-20240308

2024-03-12 09:27:01 +09:00 · 2024-03-12 09:27:01 +09:00 · 8e94ed2cec
commit 8e94ed2cec
parent fa96bf2e87 24319836de
204 changed files with 5112 additions and 1998 deletions
--- a/app/views/admin/rules/edit.html.haml
+++ b/app/views/admin/rules/edit.html.haml
@ -7,5 +7,8 @@
  .fields-group
    = f.input :text, wrapper: :with_block_label

+  .fields-group
+    = f.input :hint, wrapper: :with_block_label
+
  .actions
    = f.button :button, t('generic.save_changes'), type: :submit
--- a/app/views/admin/rules/index.html.haml
+++ b/app/views/admin/rules/index.html.haml
@ -12,6 +12,9 @@
    .fields-group
      = f.input :text, wrapper: :with_block_label

+    .fields-group
+      = f.input :hint, wrapper: :with_block_label
+
    .actions
      = f.button :button, t('admin.rules.add_new'), type: :submit

--- a/app/views/auth/registrations/rules.html.haml
+++ b/app/views/auth/registrations/rules.html.haml
@ -20,6 +20,7 @@
    - @rules.each do |rule|
      %li
        .rules-list__text= rule.text
+        .rules-list__hint= rule.hint

  .stacked-actions
    - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)