diff options
| author | Julian <julian.toelle97@gmail.com> | 2018-12-27 11:27:08 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-12-27 12:27:08 +0200 |
| commit | 4a685f8b872a3d4c101c5e8165fa99e696c8fb45 (patch) | |
| tree | 7ad36ee9bf87cec61ee0967a50037d9331d2ab58 /models/fixtures | |
| parent | 58bdff53cd98e33791f91584d02887864aabc5c4 (diff) | |
| download | gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.tar.gz gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.zip | |
Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
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 24d77b9997..f494cdd1b7 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: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}" + config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}" created_unix: 946684810 - @@ -51,7 +51,7 @@ id: 8 repo_id: 3 type: 3 - config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowSquash\":false}" + config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowRebaseMerge\":true,\"AllowSquash\":false}" created_unix: 946684810 - |