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
Joris MASSON (jmasson) 2016-04-12 14:13
cd5856caa39c29622def3daaca4f68f91bc709c7
132ade333d718955729ee9ab6d059561043ef547
git #tuleap/stable/cd5856caa39c29622def3daaca4f68f91bc709c7

Modified Files

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