Loading gitlabFilter/grid_table_filter.rb +20 −20 Original line number Diff line number Diff line Loading @@ -420,7 +420,7 @@ module Banzai raise "Missing delimiters in previous separator line" if parts.length < cells_content.length raise "Missing delimiters in row: #{line}: delimiters = #{cells_content.length}, expected delimiters = #{parts.length}" if parts.length > cells_content.length #raise "Missing delimiters in row: #{line}: delimiters = #{cells_content.length}, expected delimiters = #{parts.length}" if parts.length > cells_content.length column_index = 0 Loading Loading @@ -472,13 +472,13 @@ module Banzai row.each do |cell| next if cell.content.nil? cell.content = cell.content.gsub(/</, "<") #cell.content = cell.content.gsub(/</, "<") cell.content = cell.content.gsub(/(?<espace>^|\s)(?<bold>\*\*|__)(?<text>.+?)\g<bold>(?!\w)/, "\\k<espace><strong>\\k<text></strong>") #cell.content = cell.content.gsub(/(?<espace>^|\s)(?<bold>\*\*|__)(?<text>.+?)\g<bold>(?!\w)/, # "\\k<espace><strong>\\k<text></strong>") cell.content = cell.content.gsub(/(?<espace>^|\s)(?<italic>\*|_)(?<text>.+?)\g<italic>(?!\w)/, "\\k<espace><i>\\k<text></i>") #cell.content = cell.content.gsub(/(?<espace>^|\s)(?<italic>\*|_)(?<text>.+?)\g<italic>(?!\w)/, # "\\k<espace><i>\\k<text></i>") # Convert newlines to HTML breaks cell.content = cell.content&.gsub("\n", "<br />") end Loading Loading @@ -526,7 +526,7 @@ module Banzai "\n\nHTML TABLE COULD NOT BE GENERATED FROM MARKDOWN GRID TABLE. CHECK LOG FILE\n\n#{e.message}\n\nCommit ID: ce3607dbcafafe03531c1c50b3f749cc2318656c\n\n" else html = "<table>\n" html = '<table markdown="1">' has_header = false grid_header.each do |row| Loading @@ -539,9 +539,9 @@ module Banzai end if has_header html += " <thead>\n" html += '<thead markdown="1">' grid_header.each do |row| html += " <tr>\n" html += '<tr markdown="1">' row.each do |cell| next if cell.rowspan == 0 || cell.colspan == 0 Loading @@ -563,16 +563,16 @@ module Banzai rowspan = cell.rowspan > 1 ? %( rowspan="#{cell.rowspan}") : "" colspan = cell.colspan > 1 ? %( colspan="#{cell.colspan}") : "" html += %( <th#{rowspan}#{colspan} #{cell.alignment}>#{cell.content}</th>\n) html += %(<th#{rowspan}#{colspan} #{cell.alignment} markdown="1">\n\n#{cell.content}\n\n</th>) end html += " </tr>\n" html += '</tr>' end html += " </thead>\n" html += '</thead>' end html += " <tbody>\n" html += '<tbody markdown="1">' grid_body.each do |row| html += " <tr>\n" html += '<tr markdown="1">' row.each do |cell| next if cell.rowspan == 0 || cell.colspan == 0 Loading @@ -592,13 +592,13 @@ module Banzai rowspan = cell.rowspan > 1 ? %( rowspan="#{cell.rowspan}") : "" colspan = cell.colspan > 1 ? %( colspan="#{cell.colspan}") : "" html += %( <td#{rowspan}#{colspan} #{cell.alignment}>#{cell.content}</td>\n) html += %(<td#{rowspan}#{colspan} #{cell.alignment} markdown="1">\n\n#{cell.content}\n\n</td>) end html += " </tr>\n" html += '</tr>' end html += " </tbody>\n" html += "</table>" html += '</tbody>' html += '</table>' html end end Loading Loading
gitlabFilter/grid_table_filter.rb +20 −20 Original line number Diff line number Diff line Loading @@ -420,7 +420,7 @@ module Banzai raise "Missing delimiters in previous separator line" if parts.length < cells_content.length raise "Missing delimiters in row: #{line}: delimiters = #{cells_content.length}, expected delimiters = #{parts.length}" if parts.length > cells_content.length #raise "Missing delimiters in row: #{line}: delimiters = #{cells_content.length}, expected delimiters = #{parts.length}" if parts.length > cells_content.length column_index = 0 Loading Loading @@ -472,13 +472,13 @@ module Banzai row.each do |cell| next if cell.content.nil? cell.content = cell.content.gsub(/</, "<") #cell.content = cell.content.gsub(/</, "<") cell.content = cell.content.gsub(/(?<espace>^|\s)(?<bold>\*\*|__)(?<text>.+?)\g<bold>(?!\w)/, "\\k<espace><strong>\\k<text></strong>") #cell.content = cell.content.gsub(/(?<espace>^|\s)(?<bold>\*\*|__)(?<text>.+?)\g<bold>(?!\w)/, # "\\k<espace><strong>\\k<text></strong>") cell.content = cell.content.gsub(/(?<espace>^|\s)(?<italic>\*|_)(?<text>.+?)\g<italic>(?!\w)/, "\\k<espace><i>\\k<text></i>") #cell.content = cell.content.gsub(/(?<espace>^|\s)(?<italic>\*|_)(?<text>.+?)\g<italic>(?!\w)/, # "\\k<espace><i>\\k<text></i>") # Convert newlines to HTML breaks cell.content = cell.content&.gsub("\n", "<br />") end Loading Loading @@ -526,7 +526,7 @@ module Banzai "\n\nHTML TABLE COULD NOT BE GENERATED FROM MARKDOWN GRID TABLE. CHECK LOG FILE\n\n#{e.message}\n\nCommit ID: ce3607dbcafafe03531c1c50b3f749cc2318656c\n\n" else html = "<table>\n" html = '<table markdown="1">' has_header = false grid_header.each do |row| Loading @@ -539,9 +539,9 @@ module Banzai end if has_header html += " <thead>\n" html += '<thead markdown="1">' grid_header.each do |row| html += " <tr>\n" html += '<tr markdown="1">' row.each do |cell| next if cell.rowspan == 0 || cell.colspan == 0 Loading @@ -563,16 +563,16 @@ module Banzai rowspan = cell.rowspan > 1 ? %( rowspan="#{cell.rowspan}") : "" colspan = cell.colspan > 1 ? %( colspan="#{cell.colspan}") : "" html += %( <th#{rowspan}#{colspan} #{cell.alignment}>#{cell.content}</th>\n) html += %(<th#{rowspan}#{colspan} #{cell.alignment} markdown="1">\n\n#{cell.content}\n\n</th>) end html += " </tr>\n" html += '</tr>' end html += " </thead>\n" html += '</thead>' end html += " <tbody>\n" html += '<tbody markdown="1">' grid_body.each do |row| html += " <tr>\n" html += '<tr markdown="1">' row.each do |cell| next if cell.rowspan == 0 || cell.colspan == 0 Loading @@ -592,13 +592,13 @@ module Banzai rowspan = cell.rowspan > 1 ? %( rowspan="#{cell.rowspan}") : "" colspan = cell.colspan > 1 ? %( colspan="#{cell.colspan}") : "" html += %( <td#{rowspan}#{colspan} #{cell.alignment}>#{cell.content}</td>\n) html += %(<td#{rowspan}#{colspan} #{cell.alignment} markdown="1">\n\n#{cell.content}\n\n</td>) end html += " </tr>\n" html += '</tr>' end html += " </tbody>\n" html += "</table>" html += '</tbody>' html += '</table>' html end end Loading