Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
d531de0b
Commit
d531de0b
authored
Jan 08, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'popen_close_stdin'
Conflicts: CHANGELOG
parents
ff398219
52bc4e79
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/popen.rb
lib/gitlab/popen.rb
+3
-0
No files found.
CHANGELOG
View file @
d531de0b
...
@@ -39,6 +39,7 @@ v 7.7.0
...
@@ -39,6 +39,7 @@ v 7.7.0
-
-
- Change some of application settings on fly in admin area UI
- Change some of application settings on fly in admin area UI
- Redesign signin/signup pages
- Redesign signin/signup pages
- Close standard input in Gitlab::Popen.popen
v 7.6.0
v 7.6.0
- Fork repository to groups
- Fork repository to groups
...
...
lib/gitlab/popen.rb
View file @
d531de0b
...
@@ -21,6 +21,9 @@ module Gitlab
...
@@ -21,6 +21,9 @@ module Gitlab
@cmd_output
=
""
@cmd_output
=
""
@cmd_status
=
0
@cmd_status
=
0
Open3
.
popen3
(
vars
,
*
cmd
,
options
)
do
|
stdin
,
stdout
,
stderr
,
wait_thr
|
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
<<
stdout
.
read
@cmd_output
<<
stderr
.
read
@cmd_output
<<
stderr
.
read
@cmd_status
=
wait_thr
.
value
.
exitstatus
@cmd_status
=
wait_thr
.
value
.
exitstatus
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment