Merge branch 'popen_close_stdin'

Conflicts:
	CHANGELOG
This commit is contained in:
Dmitriy Zaporozhets 2015-01-08 15:54:34 -08:00
commit d531de0bc9
2 changed files with 4 additions and 0 deletions

View file

@ -39,6 +39,7 @@ v 7.7.0
-
- Change some of application settings on fly in admin area UI
- Redesign signin/signup pages
- Close standard input in Gitlab::Popen.popen
v 7.6.0
- Fork repository to groups

View file

@ -21,6 +21,9 @@ module Gitlab
@cmd_output = ""
@cmd_status = 0
Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|
# We are not using stdin so we should close it, in case the command we
# are running waits for input.
stdin.close
@cmd_output << stdout.read
@cmd_output << stderr.read
@cmd_status = wait_thr.value.exitstatus