diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-22 09:20:42 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-22 09:20:42 -0800 |
commit | 635f62be67a0a0e7cb02df40317e1c58c78738fb (patch) | |
tree | d204ea099c82dc19624324da51c94dce680df40d /doc/development | |
parent | b73170f5c15401e5b43ec18584c8036bf973ca0b (diff) | |
parent | a63187f28b18e2feea16681b313166a982254e4e (diff) | |
download | gitlab-ce-635f62be67a0a0e7cb02df40317e1c58c78738fb.tar.gz |
Merge branch 'stop_popen_zombies'
Conflicts:
CHANGELOG
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/shell_commands.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/shell_commands.md b/doc/development/shell_commands.md index 1e51ad73e32..42f17e19536 100644 --- a/doc/development/shell_commands.md +++ b/doc/development/shell_commands.md @@ -108,7 +108,7 @@ In other repositories, such as gitlab-shell you can also use `IO.popen`. ```ruby # Safe IO.popen example -logs = IO.popen(%W(git log), chdir: repo_dir).read +logs = IO.popen(%W(git log), chdir: repo_dir) { |p| p.read } ``` Note that unlike `Gitlab::Popen.popen`, `IO.popen` does not capture standard error. |