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 allowed option is added for template

Download Browse

This is part of story #11661: define a merge strategy for my repositories This option is not yet visible through web UI. This option is taken into account when creating a new repository (not the forked ones). The inheritance of this template option and the web UI will be done in dedicated commits. Change-Id: I65db8b7a93f17f098c3b76442053eff86d236ba8

+141 −10
Yannis ROSSETTO (rossettoy) 2018-07-31 15:44
Yannis ROSSETTO (rossettoy) 2018-07-31 18:03
7561a3fcd14e3abfeeafc58a5f88e561c44ea8ec
c92321676cfc8a132062a490a3a57b8c84649ea2
git #tuleap/stable/7561a3fcd14e3abfeeafc58a5f88e561c44ea8ec

Modified Files

Side by side diff
Inline diff
Name
A plugins/git/include/Events/AfterRepositoryCreated.php +47 −0 Go to diff View file
M plugins/git/include/Git/Repository/RepositoryCreator.php +18 −8 Go to diff View file
M plugins/git/include/REST/v1/RepositoryResource.class.php +2 −1 Go to diff View file
M plugins/git/include/gitPlugin.class.php +2 −1 Go to diff View file
M plugins/pullrequest/db/install.sql +5 −0 Go to diff View file
A plugins/pullrequest/db/mysql/updates/2018/201807311531_add_table_template_merge_setting.php +43 −0 Go to diff View file
M plugins/pullrequest/db/uninstall.sql +1 −0 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 +13 −0 Go to diff View file