stable
Clone or download
Read-only
Part of story #11661: define a merge strategy for my repositories Go to git ยป repository ยป settings ยป pull requests You can choose how pull requests will be merged (default or ff only). You cannot save yet, it will come in a dedicated changeset. Change-Id: I8cc019f627216edba68061a5fbf53573429e2842
Modified Files
Name | ||||
---|---|---|---|---|
M | plugins/git/include/GitViews.class.php | +9 | โ2 | Go to diff View file |
A | plugins/git/include/GitViews/RepoManagement/Pane/PanesCollection.php | +75 | โ0 | Go to diff View file |
M | plugins/git/include/GitViews/RepoManagement/RepoManagement.class.php | +25 | โ13 | Go to diff View file |
A | plugins/pullrequest/include/PullRequest/RepoManagement/PullRequestPane.php | +75 | โ0 | Go to diff View file |
A | plugins/pullrequest/include/PullRequest/RepoManagement/PullRequestPanePresenter.php | +47 | โ0 | Go to diff View file |
M | plugins/pullrequest/include/pullrequestPlugin.class.php | +14 | โ0 | Go to diff View file |
M | plugins/pullrequest/site-content/fr_FR/LC_MESSAGES/tuleap-pullrequest.po | +30 | โ0 | Go to diff View file |
M | plugins/pullrequest/site-content/tuleap-pullrequest.pot | +14 | โ0 | Go to diff View file |
A | plugins/pullrequest/templates/repository-settings.mustache | +20 | โ0 | Go to diff View file |
M | plugins/pullrequest/www/themes/default/css/style.scss | +7 | โ3 | Go to diff View file |