stable
Clone or download
Read-only
The setting is not yet taken into in the UI or during fork and project creation. However if you disallow merge commits for a repository and try to merge a PR needing a merge commit, the merge will be rejected with a 400. This is part of story #11661: define a merge strategy for my repositories Change-Id: Ie30eded79be088cf2f36d8e5fde3cf969482317c
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | plugins/pullrequest/db/install.sql | +5 | −0 | Go to diff View file |
| A | plugins/pullrequest/db/mysql/updates/2018/201807301400_add_table_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/GitExec.php | +5 | −0 | Go to diff View file |
| A | plugins/pullrequest/include/PullRequest/MergeSetting/MergeSetting.php | +29 | −0 | Go to diff View file |
| A | plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingDAO.php | +34 | −0 | Go to diff View file |
| A | plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingDefault.php | +32 | −0 | Go to diff View file |
| A | plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingRetriever.php | +47 | −0 | Go to diff View file |
| A | plugins/pullrequest/include/PullRequest/MergeSetting/MergeSettingWithValue.php | +39 | −0 | Go to diff View file |
| M | plugins/pullrequest/include/PullRequest/PullRequestMerger.php | +17 | −1 | Go to diff View file |
| M | plugins/pullrequest/include/PullRequest/REST/v1/PullRequestsResource.php | +5 | −1 | Go to diff View file |
| M | plugins/pullrequest/include/pullrequestPlugin.class.php | +14 | −3 | Go to diff View file |
| A | plugins/pullrequest/phpunit/MergeSetting/MergeSettingRetrieverTest.php | +68 | −0 | Go to diff View file |