mirror of
https://github.com/go-gitea/gitea.git
synced 2024-11-04 08:17:24 -05:00
8ac1501ad7
* 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
70 lines
1.1 KiB
YAML
70 lines
1.1 KiB
YAML
-
|
|
id: 1
|
|
repo_id: 1
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 2
|
|
repo_id: 1
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 3
|
|
repo_id: 1
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 4
|
|
repo_id: 1
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":true,\"AllowOnlyContributorsToTrackTime\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 5
|
|
repo_id: 1
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowSquash\":true}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 6
|
|
repo_id: 3
|
|
type: 1
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 7
|
|
repo_id: 3
|
|
type: 2
|
|
config: "{\"EnableTimetracker\":false,\"AllowOnlyContributorsToTrackTime\":false}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 8
|
|
repo_id: 3
|
|
type: 3
|
|
config: "{\"IgnoreWhitespaceConflicts\":true,\"AllowMerge\":true,\"AllowRebase\":false,\"AllowSquash\":false}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 9
|
|
repo_id: 3
|
|
type: 4
|
|
config: "{}"
|
|
created_unix: 946684810
|
|
|
|
-
|
|
id: 10
|
|
repo_id: 3
|
|
type: 5
|
|
config: "{}"
|
|
created_unix: 946684810
|