Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8a56f518
Commit
8a56f518
authored
Oct 22, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes old collapsible classes
The arrows and the cursor pointer were still being rendered
parent
462f7942
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
21 deletions
+11
-21
changelogs/unreleased/34684-job-log.yml
changelogs/unreleased/34684-job-log.yml
+5
-0
lib/gitlab/ci/ansi2html.rb
lib/gitlab/ci/ansi2html.rb
+2
-2
spec/javascripts/jobs/components/job_log_spec.js
spec/javascripts/jobs/components/job_log_spec.js
+1
-1
spec/javascripts/jobs/mock_data.js
spec/javascripts/jobs/mock_data.js
+0
-15
spec/lib/gitlab/ci/ansi2html_spec.rb
spec/lib/gitlab/ci/ansi2html_spec.rb
+3
-3
No files found.
changelogs/unreleased/34684-job-log.yml
0 → 100644
View file @
8a56f518
---
title
:
Removes arrow icons for old collapsible sections
merge_request
:
author
:
type
:
fixed
lib/gitlab/ci/ansi2html.rb
View file @
8a56f518
...
...
@@ -220,7 +220,7 @@ module Gitlab
return
if
@sections
.
include?
(
section
)
@sections
<<
section
write_raw
%{<div class="
js-section-start section-start fa fa-caret-down pr-2 cursor-pointer
" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>}
write_raw
%{<div class="
section-start
" data-timestamp="#{timestamp}" data-section="#{data_section_names}" role="button"></div>}
@lineno_in_section
=
0
end
...
...
@@ -308,7 +308,7 @@ module Gitlab
css_classes
<<
"section"
css_classes
<<
if
@lineno_in_section
==
0
"
js-section-header section-header cursor-point
er"
"
section-head
er"
else
"line"
end
...
...
spec/javascripts/jobs/components/job_log_spec.js
View file @
8a56f518
...
...
@@ -10,7 +10,7 @@ describe('Job Log', () => {
let
vm
;
const
trace
=
'
<span>Running with gitlab-runner 12.1.0 (de7731dd)<br/></span><span> on docker-auto-scale-com d5ae8d25<br/></span><div class="
js-section-start fa fa-caret-down append-right-8 cursor-pointer" data-timestamp="1565502765" data-section="prepare-executor" role="button"></div><span class="section js-section-header
section-header js-s-prepare-executor">Using Docker executor with image ruby:2.6 ...<br/></span>
'
;
'
<span>Running with gitlab-runner 12.1.0 (de7731dd)<br/></span><span> on docker-auto-scale-com d5ae8d25<br/></span><div class="
append-right-8" data-timestamp="1565502765" data-section="prepare-executor" role="button"></div><span class="section
section-header js-s-prepare-executor">Using Docker executor with image ruby:2.6 ...<br/></span>
'
;
beforeEach
(()
=>
{
store
=
createStore
();
...
...
spec/javascripts/jobs/mock_data.js
View file @
8a56f518
...
...
@@ -1189,18 +1189,3 @@ export const jobsInStage = {
path
:
'
/gitlab-org/gitlab-shell/pipelines/27#build
'
,
dropdown_path
:
'
/gitlab-org/gitlab-shell/pipelines/27/stage.json?stage=build
'
,
};
export
const
logWithCollapsibleSections
=
{
append
:
false
,
complete
:
true
,
html
:
'
<div class="js-section-start fa fa-caret-down append-right-8 cursor-pointer" data-timestamp="1559571405" data-section="after-script" role="button"></div><span class="term-fg-l-green term-bold section js-section-header js-s-after-script">Running after script...</span><span class="section js-section-header js-s-after-script"><br /></span><span class="section s_after-script line"></span><span class="section js-s-after-script"></span><span class="term-fg-l-green term-bold section js-s-after-script">$ date</span><span class="section js-s-after-script"><br /></span><span class="section s_after-script line"></span><span class="section js-s-after-script">Mon Jun 3 14:16:46 UTC 2019<br /></span><span class="section s_after-script line"></span><span class="section js-s-after-script"></span><div class="section-end" data-section="after-script"></div><div class="js-section-start fa fa-caret-down append-right-8 cursor-pointer"data-timestamp="1559571408" data-section="archive-cache" role="button" ></div><span class="term-fg-l-green term-bold section js-section-header js-s-archive-cache">Not uploading cache debian-stretch-ruby-2.6.3-node-10.x-3 due to policy</span><span class="section js-section-header js-s-archive-cache"><br /></span><span class="section s_archive-cache line"></span><span class="section js-s-archive-cache"></span><div class="section-end" data-section="archive-cache"></div><div class="js-section-start fa fa-caret-down append-right-8 cursor-pointer" data-timestamp="1559571409" data-section="upload-artifacts-on-success" role="button"></div><span class="term-fg-l-green term-bold section js-section-header js-s-upload-artifacts-on-success">Uploading artifacts...</span><span class="section js-section-header js-s-upload-artifacts-on-success"><br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success">coverage/: found 5 matching files </span><span class="section js-s-upload-artifacts-on-success"> <br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success">knapsack/: found 4 matching files </span><span class="section js-s-upload-artifacts-on-success"> <br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success">rspec_flaky/: found 4 matching files </span><span class="section js-s-upload-artifacts-on-success"> <br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success">rspec_profiling/: found 1 matching files </span><span class="section js-s-upload-artifacts-on-success"> <br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success"></span><span class="term-fg-yellow section js-s-upload-artifacts-on-success">WARNING: tmp/capybara/: no matching files </span><span class="section js-s-upload-artifacts-on-success"> <br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success">Uploading artifacts to coordinator... ok </span><span class="section js-s-upload-artifacts-on-success"> id</span><span class="section js-s-upload-artifacts-on-success">=224162288 responseStatus</span><span class="section js-s-upload-artifacts-on-success">=201 Created token</span><span class="section js-s-upload-artifacts-on-success">=bBmyXJNW<br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success"></span><span class="term-fg-l-green term-bold section js-s-upload-artifacts-on-success">Uploading artifacts...</span><span class="section js-s-upload-artifacts-on-success"><br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success">junit_rspec.xml: found 1 matching files </span><span class="section js-s-upload-artifacts-on-success"> <br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success">Uploading artifacts to coordinator... ok </span><span class="section js-s-upload-artifacts-on-success"> id</span><span class="section js-s-upload-artifacts-on-success">=224162288 responseStatus</span><span class="section js-s-upload-artifacts-on-success">=201 Created token</span><span class="section js-s-upload-artifacts-on-success">=bBmyXJNW<br /></span><span class="section s_upload-artifacts-on-success line"></span><span class="section js-s-upload-artifacts-on-success"></span><div class="section-end" data-section="upload-artifacts-on-success"></div><span class="term-fg-l-green term-bold">Job succeeded<br /><span class="term-fg-l-green term-bold"></span></span>
'
,
id
:
1385
,
offset
:
0
,
size
:
78815
,
state
:
'
eyJvZmZzZXQiOjc4ODE1LCJuX29wZW5fdGFncyI6MCwiZmdfY29sb3IiOm51bGwsImJnX2NvbG9yIjpudWxsLCJzdHlsZV9tYXNrIjowLCJzZWN0aW9ucyI6W10sImxpbmVub19pbl9zZWN0aW9uIjoxMX0=
'
,
status
:
'
success
'
,
total
:
78815
,
truncated
:
false
,
};
spec/lib/gitlab/ci/ansi2html_spec.rb
View file @
8a56f518
...
...
@@ -209,7 +209,7 @@ describe Gitlab::Ci::Ansi2html do
let
(
:section_start
)
{
"section_start:
#{
section_start_time
.
to_i
}
:
#{
section_name
}
\r\033
[0K"
}
let
(
:section_end
)
{
"section_end:
#{
section_end_time
.
to_i
}
:
#{
section_name
}
\r\033
[0K"
}
let
(
:section_start_html
)
do
'<div class="
js-section-start section-start fa fa-caret-down pr-2 cursor-pointer
"'
\
'<div class="
section-start
"'
\
" data-timestamp=
\"
#{
section_start_time
.
to_i
}
\"
data-section=
\"
#{
class_name
(
section_name
)
}
\"
"
\
' role="button"></div>'
end
...
...
@@ -233,8 +233,8 @@ describe Gitlab::Ci::Ansi2html do
it
'prints light red'
do
text
=
"
#{
section_start
}
\e
[91mHello
\e
[0m
\n
Line 1
\n
Line 2
\n
Line 3
\n
#{
section_end
}
"
header
=
%{<span class="term-fg-l-red section
js-section-header section-header cursor-point
er js-s-#{class_name(section_name)}">Hello</span>}
line_break
=
%{<span class="section
js-section-header section-header cursor-point
er js-s-#{class_name(section_name)}"><br/></span>}
header
=
%{<span class="term-fg-l-red section
section-head
er js-s-#{class_name(section_name)}">Hello</span>}
line_break
=
%{<span class="section
section-head
er js-s-#{class_name(section_name)}"><br/></span>}
output_line
=
%{<span class="section line js-s-#{class_name(section_name)}">Line 1<br/>Line 2<br/>Line 3<br/></span>}
html
=
"
#{
section_start_html
}#{
header
}#{
line_break
}#{
output_line
}#{
section_end_html
}
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment