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
7c49f3ea
Commit
7c49f3ea
authored
Jan 30, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Use send_data for sending raw trace"
This reverts commit 0acbd89805dd1bb4728857d6da88070cd782040f.
parent
ab55e75a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
3 deletions
+18
-3
app/controllers/projects/jobs_controller.rb
app/controllers/projects/jobs_controller.rb
+18
-3
No files found.
app/controllers/projects/jobs_controller.rb
View file @
7c49f3ea
...
...
@@ -119,10 +119,25 @@ class Projects::JobsController < Projects::ApplicationController
end
def
raw
if
build
.
trace
.
exist?
send_data
build
.
trace
.
raw
,
type:
'text/plain; charset=utf-8'
,
:disposition
=>
'inline'
if
trace_artifact
send_upload
(
trace_artifact
.
file
,
send_params:
{
type:
'text/plain; charset=utf-8'
,
disposition:
'inline'
},
redirect_params:
{
query:
{
"response-content-disposition"
=>
"inline"
}
}
)
else
render_404
build
.
trace
.
read
do
|
stream
|
if
stream
.
file?
send_file
stream
.
path
,
type:
'text/plain; charset=utf-8'
,
disposition:
'inline'
else
render_404
end
end
end
end
...
...
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