diff options
author | Go MAEDA <maeda@farend.jp> | 2023-01-16 12:57:42 +0000 |
---|---|---|
committer | Go MAEDA <maeda@farend.jp> | 2023-01-16 12:57:42 +0000 |
commit | b18780bb3676d46df876f385961ec58afd09d1f8 (patch) | |
tree | 146b7c9191f2ac528adb4b61e063de963dd6ffe0 /lib | |
parent | 2b74f121cd7f8caa5e7ab408a8d6267aeef0b810 (diff) | |
download | redmine-b18780bb3676d46df876f385961ec58afd09d1f8.tar.gz redmine-b18780bb3676d46df876f385961ec58afd09d1f8.zip |
Merged r22025 from trunk to 5.0-stable (#38073).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22048 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r-- | lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb index adb301290..54e0db4cb 100644 --- a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb +++ b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb @@ -29,8 +29,8 @@ module Redmine ALLOWED_CSS_PROPERTIES = %w[ color background-color - width - height + width min-width max-width + height min-height max-height padding padding-left padding-right padding-top padding-bottom margin margin-left margin-right margin-top margin-bottom border border-left border-right border-top border-bottom border-radius border-style border-collapse border-spacing |