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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
56011f9f
Commit
56011f9f
authored
Aug 25, 2016
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactorize CI::Build model
parent
cc365e98
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
app/models/ci/build.rb
app/models/ci/build.rb
+10
-2
No files found.
app/models/ci/build.rb
View file @
56011f9f
...
...
@@ -209,7 +209,7 @@ module Ci
end
def
has_trace_file?
File
.
exist?
(
path_to_trace
)
||
(
project
.
ci_id
&&
File
.
exist?
(
old_path_to_trace
))
File
.
exist?
(
path_to_trace
)
||
has_old_trace_file?
end
def
has_trace?
...
...
@@ -219,7 +219,7 @@ module Ci
def
raw_trace
if
File
.
file?
(
path_to_trace
)
File
.
read
(
path_to_trace
)
elsif
project
.
ci_id
&&
File
.
file?
(
old_path_to_trace
)
elsif
has_old_trace_file?
# Temporary fix for build trace data integrity
File
.
read
(
old_path_to_trace
)
else
...
...
@@ -228,6 +228,14 @@ module Ci
end
end
##
# Deprecated
#
# This is a hotfix for CI build data integrity, see #4246
def
has_old_trace_file?
project
.
ci_id
&&
File
.
exist?
(
old_path_to_trace
)
end
def
trace
trace
=
raw_trace
if
project
&&
trace
.
present?
&&
project
.
runners_token
.
present?
...
...
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