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
Léo-Paul Géneau
gitlab-ce
Commits
373f6a9b
Commit
373f6a9b
authored
Apr 06, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add change log
parent
2dcbaf9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
app/controllers/projects/jobs_controller.rb
app/controllers/projects/jobs_controller.rb
+0
-2
changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml
...gs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml
+5
-0
No files found.
app/controllers/projects/jobs_controller.rb
View file @
373f6a9b
...
@@ -127,8 +127,6 @@ class Projects::JobsController < Projects::ApplicationController
...
@@ -127,8 +127,6 @@ class Projects::JobsController < Projects::ApplicationController
build
.
trace
.
read
do
|
stream
|
build
.
trace
.
read
do
|
stream
|
if
stream
.
file?
if
stream
.
file?
send_file
stream
.
path
,
type:
'text/plain; charset=utf-8'
,
disposition:
'inline'
send_file
stream
.
path
,
type:
'text/plain; charset=utf-8'
,
disposition:
'inline'
elsif
build
.
old_trace
send_data
stream
.
raw
,
type:
'text/plain; charset=utf-8'
,
disposition:
'inline'
,
filename:
'job.log'
else
else
send_data
stream
.
raw
,
type:
'text/plain; charset=utf-8'
,
disposition:
'inline'
,
filename:
'job.log'
send_data
stream
.
raw
,
type:
'text/plain; charset=utf-8'
,
disposition:
'inline'
,
filename:
'job.log'
end
end
...
...
changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml
0 → 100644
View file @
373f6a9b
---
title
:
Fix `JobsController#raw` endpoint can not read traces in database
merge_request
:
18101
author
:
type
:
fixed
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