Fix Project's MergeMethod type (#529)

ffbc4795 · Martín Fernández · Sander van Harmelen · 6cd77382 · ffbc4795
Commit ffbc4795 authored Dec 14, 2018 by Martín Fernández Committed by Sander van Harmelen Dec 14, 2018
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

projects.go projects.go +1 -1

No files found.
--- a/projects.go
+++ b/projects.go
@@ -79,7 +79,7 @@ type Project struct {
 	OnlyAllowMergeIfAllDiscussionsAreResolved bool              `json:"only_allow_merge_if_all_discussions_are_resolved"`
 	LFSEnabled                                bool              `json:"lfs_enabled"`
 	RequestAccessEnabled                      bool              `json:"request_access_enabled"`
-	MergeMethod                               string            `json:"merge_method"`
+	MergeMethod                               MergeMethodValue  `json:"merge_method"`
 	ForkedFromProject                         *ForkParent       `json:"forked_from_project"`
 	SharedWithGroups                          []struct {
 		GroupID          int    `json:"group_id"`