Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-04-03 18:59:24 +0300
committerShinya Maeda <shinya@gitlab.com>2018-04-03 18:59:24 +0300
commit326a8c64538ade3a6d09893fb5d5d78c2a5c3f77 (patch)
tree3f19d5a70e3324c117c09679f98b31f3a040f5d5 /app/controllers/projects/jobs_controller.rb
parent16b6c46ab1b6f2f001a48cb33aaf3a5cddd1d6eb (diff)
Update jobs_controller.rb
Diffstat (limited to 'app/controllers/projects/jobs_controller.rb')
-rw-r--r--app/controllers/projects/jobs_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb
index 38b97ac1fd3..ac9eb2047a0 100644
--- a/app/controllers/projects/jobs_controller.rb
+++ b/app/controllers/projects/jobs_controller.rb
@@ -127,7 +127,7 @@ 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
+ else
send_data stream.raw, type: 'text/plain; charset=utf-8', disposition: 'inline', filename: 'job.log'
end
end