scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-02 13:12:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2973 from aignatov-bio/ai-sci-5044-fix-merge-cells-pdf-report

Browse source 
Fix merge cells for pdf reports [SCI-5044]
This commit is contained in:
aignatov-bio 2020-11-24 12:33:40 +01:00 committed by GitHub
commit 0b2e5063a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/initializers/constants.rb
View file

@ -320,7 +320,8 @@ class Constants
WHITELISTED_ATTRIBUTES = [
'href', 'src', 'width', 'height', 'alt', 'cite', 'datetime', 'title',
'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border', 'contenteditable'
'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border', 'contenteditable',
'colspan', 'rowspan'
].freeze
WHITELISTED_CSS_ATTRIBUTES = {