diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-04-05 20:43:25 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-05 20:43:25 +0900 |
commit | b2025caad3a509c0fa5503e5fc8427fc4c9defc1 (patch) | |
tree | 32a7e132bfed0916a759f0b1a27789c92d763aea /app/controllers | |
parent | 9c990bbe7a4f213778b60fcd63f21719c6433d93 (diff) | |
parent | 326a8c64538ade3a6d09893fb5d5d78c2a5c3f77 (diff) | |
download | gitlab-ce-b2025caad3a509c0fa5503e5fc8427fc4c9defc1.tar.gz |
Merge branch '44665-fix-db-trace-stream-by-raw-access' of gitlab.com:gitlab-org/gitlab-ce into 44665-fix-db-trace-stream-by-raw-access
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index a604f623e49..539bb9a14a7 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -130,7 +130,7 @@ class Projects::JobsController < Projects::ApplicationController elsif build.old_trace send_data stream.raw, type: 'text/plain; charset=utf-8', disposition: 'inline', filename: 'job.log' else - render_404 + send_data stream.raw, type: 'text/plain; charset=utf-8', disposition: 'inline', filename: 'job.log' end end end |