stable

Clone or download

Read-only

Forked repositories inherit base repository merge settings

This is part of story #11661: define a merge strategy for my repositories Change-Id: I5b60cd145add8ea6e6aaead4cdf76bcfd55baddf

Modified Files

Name
M plugins/git/include/GitRepositoryManager.class.php +4 −0 Go to diff View file
A plugins/git/include/events/AfterRepositoryForked.php +61 −0 Go to diff View file
M plugins/git/tests/GitRepositoryManagerTest.php +13 −1 Go to diff View file
M plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingDAO.php +10 −0 Go to diff View file
M plugins/pullrequest/include/pullrequestPlugin.class.php +11 −0 Go to diff View file