kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '63417-add-missing-class' into 'master'

Browse source 
Adds missing class in collapsible sections

Closes #63417

See merge request gitlab-org/gitlab-ce!29804
This commit is contained in:
Kamil Trzciński 2019-06-19 12:56:41 +00:00
commit 22755a4aa2
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/63417-add-missing-class.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Indent collapsible sections
merge_request: 29804
author:
type: other

2
lib/gitlab/ci/ansi2html.rb
View file

@ -310,7 +310,7 @@ module Gitlab
if @sections.any?
css_classes << "section"
css_classes << "js-section-header" if @lineno_in_section == 0
css_classes << "js-section-header section-header" if @lineno_in_section == 0
css_classes += sections.map { |section| "js-s-#{section}" }
end

4
spec/lib/gitlab/ci/ansi2html_spec.rb
View file

@ -231,8 +231,8 @@ describe Gitlab::Ci::Ansi2html do
it 'prints light red' do
text = "#{section_start}\e[91mHello\e[0m\n#{section_end}"
header = %{<span class="term-fg-l-red section js-section-header js-s-#{class_name(section_name)}">Hello</span>}
line_break = %{<span class="section js-section-header js-s-#{class_name(section_name)}"><br/></span>}
header = %{<span class="term-fg-l-red section js-section-header section-header js-s-#{class_name(section_name)}">Hello</span>}
line_break = %{<span class="section js-section-header section-header js-s-#{class_name(section_name)}"><br/></span>}
line = %{<span class="section line s_#{class_name(section_name)}"></span>}
empty_line = %{<span class="section js-s-#{class_name(section_name)}"></span>}
html = "#{section_start_html}#{header}#{line_break}#{line}#{empty_line}#{section_end_html}"