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

2023-12-04 12:04:52 +09:00 · 2023-12-04 12:04:52 +09:00 · 94c2396a34
commit 94c2396a34
parent 780426db31 456597dae5
179 changed files with 1036 additions and 775 deletions
--- a/app/models/user_role.rb
+++ b/app/models/user_role.rb
@ -51,7 +51,7 @@ class UserRole < ApplicationRecord
        invite_users
      ).freeze,

-      moderation: %w(
+      moderation: %i(
        view_dashboard
        view_audit_log
        manage_users
@ -67,7 +67,7 @@ class UserRole < ApplicationRecord
        manage_sensitive_words
      ).freeze,

-      administration: %w(
+      administration: %i(
        manage_settings
        manage_rules
        manage_roles
@ -76,7 +76,7 @@ class UserRole < ApplicationRecord
        manage_announcements
      ).freeze,

-      devops: %w(
+      devops: %i(
        view_devops
      ).freeze,