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
a98a462f
Commit
a98a462f
authored
May 27, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert correctly
parent
db55fa59
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
lib/api/runner.rb
lib/api/runner.rb
+2
-2
lib/gitlab/ci/trace.rb
lib/gitlab/ci/trace.rb
+4
-4
No files found.
lib/api/runner.rb
View file @
a98a462f
...
@@ -132,9 +132,9 @@ module API
...
@@ -132,9 +132,9 @@ module API
case
params
[
:state
].
to_s
case
params
[
:state
].
to_s
when
'success'
when
'success'
job
.
success
job
.
success
!
when
'failed'
when
'failed'
job
.
drop
(
params
[
:failure_reason
]
||
:unknown_failure
)
job
.
drop
!
(
params
[
:failure_reason
]
||
:unknown_failure
)
end
end
end
end
...
...
lib/gitlab/ci/trace.rb
View file @
a98a462f
...
@@ -59,7 +59,9 @@ module Gitlab
...
@@ -59,7 +59,9 @@ module Gitlab
def
read
def
read
stream
=
Gitlab
::
Ci
::
Trace
::
Stream
.
new
do
stream
=
Gitlab
::
Ci
::
Trace
::
Stream
.
new
do
if
job
.
trace_chunks
.
any?
if
trace_artifact
trace_artifact
.
open
elsif
job
.
trace_chunks
.
any?
Gitlab
::
Ci
::
Trace
::
ChunkedIO
.
new
(
job
)
Gitlab
::
Ci
::
Trace
::
ChunkedIO
.
new
(
job
)
elsif
current_path
elsif
current_path
File
.
open
(
current_path
,
"rb"
)
File
.
open
(
current_path
,
"rb"
)
...
@@ -75,9 +77,7 @@ module Gitlab
...
@@ -75,9 +77,7 @@ module Gitlab
def
write
(
mode
)
def
write
(
mode
)
stream
=
Gitlab
::
Ci
::
Trace
::
Stream
.
new
do
stream
=
Gitlab
::
Ci
::
Trace
::
Stream
.
new
do
if
trace_artifact
if
current_path
# no op. It's already archived.
elsif
current_path
File
.
open
(
current_path
,
mode
)
File
.
open
(
current_path
,
mode
)
elsif
Feature
.
enabled?
(
'ci_enable_live_trace'
)
elsif
Feature
.
enabled?
(
'ci_enable_live_trace'
)
Gitlab
::
Ci
::
Trace
::
ChunkedIO
.
new
(
job
)
Gitlab
::
Ci
::
Trace
::
ChunkedIO
.
new
(
job
)
...
...
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