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

Merge commit 'refs/changes/33/5133/8' of ssh://gerrit.tuleap.net:29418/tuleap into stable

Download Browse

* ssh://gerrit.tuleap.net:29418/tuleap: story #8825: Merge pull request

+436 −33
Nicolas Terray (nterray) 2016-02-25 08:33
Nicolas Terray (nterray) 2016-02-25 08:33
4e64a8668d4f161aa8dc49484ccdd5b97a78a55b
git #tuleap/stable/4e64a8668d4f161aa8dc49484ccdd5b97a78a55b

Modified Files

Side by side diff
Inline diff
Name
M plugins/pullrequest/include/PullRequest/Dao.php +13 −1 Go to diff View file
A plugins/pullrequest/include/PullRequest/Exception/PullRequestCannotBeMerged.php +25 −0 Go to diff View file
M plugins/pullrequest/include/PullRequest/GitExec.php +23 −0 Go to diff View file
M plugins/pullrequest/include/PullRequest/PullRequest.php +4 −0 Go to diff View file
M plugins/pullrequest/include/PullRequest/PullRequestCloser.php +72 −2 Go to diff View file
M plugins/pullrequest/include/PullRequest/REST/v1/PullRequestRepresentation.php +6 −3 Go to diff View file
M plugins/pullrequest/include/PullRequest/REST/v1/PullRequestsResource.php +53 −21 Go to diff View file
M plugins/pullrequest/include/autoload.php +3 −2 Go to diff View file
M plugins/pullrequest/include/constants.php +0 −3 Go to diff View file
M plugins/pullrequest/tests/GitExecTest.php +71 −1 Go to diff View file
A plugins/pullrequest/tests/PullRequestCloserTest.php +166 −0 Go to diff View file