Merge branch 'fix-multi-line-hook-output' into 'master'

Display full pre-receive and post-receive hook output in GitLab UI

Closes #25214

See merge request gitlab-org/gitlab-ce!14222

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/gitlab/git/hook.rb b/lib/gitlab/git/hook.rb
index cc35d77c6e4..208e4bbaf60 100644
--- a/lib/gitlab/git/hook.rb
+++ b/lib/gitlab/git/hook.rb
@@ -83,13 +83,14 @@ module Gitlab
       def call_update_hook(gl_id, oldrev, newrev, ref)
         Dir.chdir(repo_path) do
           stdout, stderr, status = Open3.capture3({ 'GL_ID' => gl_id }, path, ref, oldrev, newrev)
-          [status.success?, stderr.presence || stdout]
+          [status.success?, (stderr.presence || stdout).gsub(/\R/, "<br>").html_safe]
         end
       end
 
       def retrieve_error_message(stderr, stdout)
-        err_message = stderr.gets
-        err_message.blank? ? stdout.gets : err_message
+        err_message = stderr.read
+        err_message = err_message.blank? ? stdout.read : err_message
+        err_message.gsub(/\R/, "<br>").html_safe
       end
     end
   end