diff options
| author | Lauris BH <lauris@nix.lv> | 2018-01-05 20:56:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 20:56:50 +0200 |
| commit | 8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9 (patch) | |
| tree | cf9b661996134da3e39aa6ddd2af4e13f7dbf30f /models/fixtures | |
| parent | a192f3052ed9b59d1404fdcebf2b5c156d6d6969 (diff) | |
| download | gitea-8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9.tar.gz gitea-8ac1501ad7f8b350bd9c1bf01b25f994fd3560f9.zip | |
Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)
* Pull request options migration and UI in settings
* Add ignore whitespace functionality
* Fix settings if pull requests are disabled
* Fix migration transaction
* Merge with Rebase functionality
* UI changes and related functionality for pull request merging button
* Implement squash functionality
* Fix rebase merging
* Fix pull request merge tests
* Add squash and rebase tests
* Fix API method to reuse default message functions
* Some refactoring and small fixes
* Remove more hardcoded values from tests
* Remove unneeded check from API method
* Fix variable name and comment typo
* Fix reset commit count after PR merge
Diffstat (limited to 'models/fixtures')
| -rw-r--r-- | models/fixtures/repo_unit.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/fixtures/repo_unit.yml b/models/fixtures/repo_unit.yml index e9931453ad..45229cce37 100644 --- a/models/fixtures/repo_unit.yml +++ b/models/fixtures/repo_unit.yml @@ -30,7 +30,7 @@ id: 5 repo_id: 1 type: 3 - config: "{}" + config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}" created_unix: 946684810 - @@ -51,7 +51,7 @@ id: 8 repo_id: 3 type: 3 - config: "{}" + config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowSquash\":false}" created_unix: 946684810 - |