Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gpt
large_projects
gitlabhq1
Commits
575bd66a
Commit
575bd66a
authored
7 years ago
by
Shinya Maeda
Browse files
Options
Download
Email Patches
Plain Diff
nice
parent
b320ad35
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
lib/gitlab/ci/trace.rb
lib/gitlab/ci/trace.rb
+2
-4
lib/gitlab/ci/trace/full.rb
lib/gitlab/ci/trace/full.rb
+8
-3
No files found.
lib/gitlab/ci/trace.rb
View file @
575bd66a
...
...
@@ -9,12 +9,10 @@ module Gitlab
end
def
type
(
job
)
if
job
.
complete?
&&
job
.
job_artifacts_trace
.
exists?
if
job
.
complete?
'Full'
elsif
job
.
running?
'Live'
else
'
Undefined
'
'
Live
'
end
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/ci/trace/full.rb
View file @
575bd66a
...
...
@@ -5,7 +5,7 @@ module Gitlab
delegate
:old_trace
,
to: :job
def
exist?
job
.
job_artifacts_trace
&
.
exists?
||
old_trace
.
present?
job
.
job_artifacts_trace
&
.
exists?
||
current_path
.
present?
||
old_trace
.
present?
end
def
erase!
...
...
@@ -26,11 +26,16 @@ module Gitlab
end
def
paths
raise
'Full trace does not allow write operation'
[
default_path
,
deprecated_path
].
compact
end
def
current_path
raise
'Full trace does not allow write operation'
@current_path
||=
paths
.
find
do
|
trace_path
|
File
.
exist?
(
trace_path
)
end
end
def
default_directory
...
...
This diff is collapsed.
Click to expand it.
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