diff options
Diffstat (limited to 'modules/structs/repo_branch.go')
| -rw-r--r-- | modules/structs/repo_branch.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/structs/repo_branch.go b/modules/structs/repo_branch.go index a9aa1d330a..5416f43b0d 100644 --- a/modules/structs/repo_branch.go +++ b/modules/structs/repo_branch.go @@ -133,3 +133,12 @@ type EditBranchProtectionOption struct { type UpdateBranchProtectionPriories struct { IDs []int64 `json:"ids"` } + +type MergeUpstreamRequest struct { + Branch string `json:"branch"` + FfOnly bool `json:"ff_only"` +} + +type MergeUpstreamResponse struct { + MergeStyle string `json:"merge_type"` +} |