Revert "Upstream 20240517"

2024-05-24 08:15:12 +09:00 · 2024-05-24 08:15:12 +09:00 · f6dec44e95
commit f6dec44e95
parent 9c006fd893
2347 changed files with 26470 additions and 87494 deletions
--- a/app/controllers/custom_css_controller.rb
+++ b/app/controllers/custom_css_controller.rb
@ -16,6 +16,6 @@ class CustomCssController < ActionController::Base # rubocop:disable Rails/Appli
  helper_method :custom_css_styles

  def set_user_roles
-    @user_roles = UserRole.providing_styles
+    @user_roles = UserRole.where(highlighted: true).where.not(color: [nil, ''])
  end
 end