diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-04-06 01:44:24 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-06 01:44:24 +0900 |
| commit | 373f6a9bb20497eebe4cdf41be18eb2399424a59 (patch) | |
| tree | b20ce8f022278c2ad9af55bc9b038590d0b5e036 | |
| parent | 2dcbaf9f0eb4c63d7cbe3252b20220e798ee0079 (diff) | |
| download | gitlab-ce-373f6a9bb20497eebe4cdf41be18eb2399424a59.tar.gz | |
Add change log
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 539bb9a14a7..ac9eb2047a0 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -127,8 +127,6 @@ class Projects::JobsController < Projects::ApplicationController build.trace.read do |stream| if stream.file? 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 send_data stream.raw, type: 'text/plain; charset=utf-8', disposition: 'inline', filename: 'job.log' end diff --git a/changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml b/changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml new file mode 100644 index 00000000000..4166d4fe320 --- /dev/null +++ b/changelogs/unreleased/44665-fix-db-trace-stream-by-raw-access.yml @@ -0,0 +1,5 @@ +--- +title: Fix `JobsController#raw` endpoint can not read traces in database +merge_request: 18101 +author: +type: fixed |