summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2025-04-27 08:18:02 +0000
committerGo MAEDA <maeda@farend.jp>2025-04-27 08:18:02 +0000
commit3644cb5cf27fbdc7c6cf26c2974f8bf3618e42e8 (patch)
tree706c5f5e736018aa627e1306e5a721c83ffe646f
parent92892d892c9a88f6fbed227baaad00b0b2f97ae0 (diff)
downloadredmine-3644cb5cf27fbdc7c6cf26c2974f8bf3618e42e8.tar.gz
redmine-3644cb5cf27fbdc7c6cf26c2974f8bf3618e42e8.zip
Merged r23712 from trunk to 5.1-stable (#42622).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23721 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/user.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index d189898dd..0f18e39e5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -87,8 +87,8 @@ class User < Principal
:after_remove => Proc.new {|user, group| group.user_removed(user)}
pre { line-height: 125%; } td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { col