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

UI for default settings

Download Browse

Part of story #11661: define a merge strategy for my repositories Go to project » git » admin » git settings template » pull requests You can now set the default settings for pull requests. Change is applied for new repositories. Change is reflected in project history. Change-Id: I65b99687e77f96c18599b3bd1c09092856f51b37

+482 −17
Nicolas Terray (nterray) 2018-08-06 15:18
Nicolas Terray (nterray) 2018-08-07 10:14
7715b4fafe0610a6106aad6b7fe8fee744d99f37
f2c92cf76121e22a8edaafccde13b59b8c60d668
git #tuleap/stable/7715b4fafe0610a6106aad6b7fe8fee744d99f37

Modified Files

Side by side diff
Inline diff
Name
M plugins/git/include/Git/DefaultSettings/IndexController.php +23 −11 Go to diff View file
A plugins/git/include/Git/DefaultSettings/Pane/DefaultSettingsPanesCollection.php +74 −0 Go to diff View file
M plugins/git/include/gitPlugin.class.php +2 −1 Go to diff View file
A plugins/pullrequest/include/PullRequest/DefaultSettings/DefaultSettingsController.php +82 −0 Go to diff View file
A plugins/pullrequest/include/PullRequest/DefaultSettings/PullRequestPane.php +76 −0 Go to diff View file
A plugins/pullrequest/include/PullRequest/DefaultSettings/PullRequestPanePresenter.php +42 −0 Go to diff View file
M plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingDAO.php +17 −0 Go to diff View file
M plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingRetriever.php +17 −1 Go to diff View file
M plugins/pullrequest/include/pullrequestPlugin.class.php +40 −1 Go to diff View file
M plugins/pullrequest/site-content/en_US/pullrequest.tab +2 −0 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/fr_FR/pullrequest.tab +2 −0 Go to diff View file
M plugins/pullrequest/site-content/tuleap-pullrequest.pot +3 −0 Go to diff View file
A plugins/pullrequest/templates/default-settings.mustache +19 −0 Go to diff View file
M src/common/autoload.php +3 −2 Go to diff View file
A src/common/project/Admin/GetProjectHistoryEntryValue.php +72 −0 Go to diff View file
M src/www/project/admin/project_admin_utils.php +5 −1 Go to diff View file