Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

stable

Clone or download

Read-only

request #10427: Use expected temporary directory when trying to merge a pull request

Download Browse

Instead of using a working directory under /var/lib/tuleap/gitolite/repositories/, this contribution uses a directory in the directory defined by the configuration parameter tmp_dir. It seems that directories under /var/lib/tuleap/gitolite/repositories/ can become owned the gitolite user which, once it's the case, block merge tentatives. Change-Id: I8051a2a83ca3543a7de1bc2ede0b8a2f2a185914

+18 −10
Thomas Gerbet (tgerbet) 2017-07-07 17:22
Thomas Gerbet (tgerbet) 2017-07-07 17:22
2c4d72119ad9c631e241ccf7539570254d7b0844
e39bd69ad3ccec1889d1b4da94d241dded2c44f3
git #tuleap/stable/2c4d72119ad9c631e241ccf7539570254d7b0844

Modified Files

Side by side diff
Inline diff
Name
M include/PullRequest/PullRequestMerger.php +18 −10 Go to diff View file