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

story #8825: Merge pull request

Download Browse

At this point, only fast-forward merges are taken into account. Change-Id: I4f70827f5af1319cf86ea1c8abd3a84acc41c166

+436 −33
Joris MASSON (jmasson) 2016-02-23 14:02
Yannis ROSSETTO (rossettoy) 2016-02-24 19:26
8e52690237260feb617f5ec4f1ede4d521093a7b
6160495094c37bc386ff80d74eb4f85ad90350de
git #tuleap/stable/8e52690237260feb617f5ec4f1ede4d521093a7b

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