summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-02 13:15:03 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-02 13:15:03 +0200
commit1ee239c5f91da9e744b97505a2325aeea1098730 (patch)
tree4546744282d416a5d22005d92e72a7b046baa828
parent54bedd646602b5af0faad83540719a0a0adb5cd3 (diff)
downloadgitlab-ci-1ee239c5f91da9e744b97505a2325aeea1098730.tar.gz
Add stderr
-rw-r--r--app/views/builds/show.html.haml2
-rw-r--r--lib/runner.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/builds/show.html.haml b/app/views/builds/show.html.haml
index d865542..0b0dac4 100644
--- a/app/views/builds/show.html.haml
+++ b/app/views/builds/show.html.haml
@@ -18,7 +18,7 @@
.clearfix
%pre.trace#build-trace
= preserve do
- = @build.trace
+ = raw @build.trace
%br
.right
%a.btn.btn-small{href: project_path(@project)} Builds
diff --git a/lib/runner.rb b/lib/runner.rb
index edc62ce..529cec3 100644
--- a/lib/runner.rb
+++ b/lib/runner.rb
@@ -61,6 +61,7 @@ class Runner
@process = ChildProcess.build(cmd)
@tmp_file = Tempfile.new("child-output")
@process.io.stdout = @tmp_file
+ @process.io.stderr = @tmp_file
@process.cwd = path
@process.environment['BUNDLE_GEMFILE'] = ''
@process.start