tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Add rebase with merge commit merge style (#3844) (#4052)

Browse Source 
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
This commit is contained in:
Julian
2018-12-27 11:27:08 +01:00
committed by Lauris BH
parent 58bdff53cd
commit 4a685f8b87
14 changed files with 162 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
models/fixtures/repo_unit.yml
View File

@@ -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
-