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

User can now change the PR settings for repository

Download Browse

Part of story #11661: define a merge strategy for my repositories Go to git » repository » settings » pull requests. You can now change the settings. You can still create pull requests (introduction of FrontRouter). Change-Id: I5db575d4e370bf4e351958bc8b6be22d6c47145b

+185 −39
Nicolas Terray (nterray) 2018-08-02 16:17
Nicolas Terray (nterray) 2018-08-03 09:10
1f7dbae81d53882b969dc0e9d8d5786a121285fc
d597ee11bd28a6f090f0c57cd9c6a44f6197a185
git #tuleap/stable/1f7dbae81d53882b969dc0e9d8d5786a121285fc

Modified Files

Side by side diff
Inline diff
Name
A plugins/pullrequest/etc/nginx18/pullrequest.conf +21 −0 Go to diff View file
R plugins/pullrequest/include/PullRequest/Router.php Go to diff View file
M plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingDAO.php +9 −0 Go to diff View file
M plugins/pullrequest/include/PullRequest/RepoManagement/PullRequestPane.php +3 −1 Go to diff View file
A plugins/pullrequest/include/PullRequest/RepoManagement/RepoManagementController.php +106 −0 Go to diff View file
M plugins/pullrequest/include/pullrequestPlugin.class.php +36 −4 Go to diff View file
M plugins/pullrequest/site-content/fr_FR/LC_MESSAGES/tuleap-pullrequest.po +3 −0 Go to diff View file
M plugins/pullrequest/site-content/tuleap-pullrequest.pot +3 −0 Go to diff View file
M plugins/pullrequest/templates/repository-settings.mustache +4 −4 Go to diff View file
D plugins/pullrequest/www/index.php +0 −30 Go to diff View file