diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-18 00:10:06 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-18 00:10:06 +0530 |
| commit | 5b336ff44364ac4adcf137838e71a8f0bb4f35a0 (patch) | |
| tree | c15002d3b3a2a5c2a2f8c17c309f170620025408 /actionpack/lib/action_controller | |
| parent | 1d26fcb9f896a3dc98d90ad734aa5da7ac2bbcda (diff) | |
| parent | b7e3c8e1f387e4c0843371971317ca7972d8aeb5 (diff) | |
| download | rails-5b336ff44364ac4adcf137838e71a8f0bb4f35a0.tar.gz rails-5b336ff44364ac4adcf137838e71a8f0bb4f35a0.tar.bz2 rails-5b336ff44364ac4adcf137838e71a8f0bb4f35a0.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb index e9b50ff8ce..114b0e73c9 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb @@ -99,7 +99,7 @@ module HTML self.allowed_protocols = Set.new(%w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto feed svn urn aim rsync tag ssh sftp rtsp afs)) - # Specifies the default Set of acceptable css keywords that #sanitize and #sanitize_css will accept. + # Specifies the default Set of acceptable css properties that #sanitize and #sanitize_css will accept. self.allowed_css_properties = Set.new(%w(azimuth background-color border-bottom-color border-collapse border-color border-left-color border-right-color border-top-color clear color cursor direction display elevation float font font-family font-size font-style font-variant font-weight height letter-spacing line-height |