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

Forked repositories inherit base repository merge settings

Download Browse

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

+99 −1
Yannis ROSSETTO (rossettoy) 2018-07-31 10:52
Yannis ROSSETTO (rossettoy) 2018-07-31 11:10
dae2ab4c54602d06903167c3f5d8c2b9c19ab5e0
06be2e1698162f3072c921b59b2ac6d0c2266ae4
git #tuleap/stable/dae2ab4c54602d06903167c3f5d8c2b9c19ab5e0

Modified Files

Side by side diff
Inline diff
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