docs(proto): allow every merge mode by default
- commit
- 788238fbe59a36d32bc8fa4a7c30897737fe97e7
- author
- brice · · 2026-10-19 12:34 UTC
- committer
- brice · · 2026-10-19 14:35 UTC
- parent
- c671ff4
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
2 files · +4 -4
M gen/ermite/repo.pb.go +2 -2
| @@ -143,8 +143,8 @@ type RepoSettings struct { | |||
| 143 | 143 | state protoimpl.MessageState `protogen:"open.v1"` | |
| 144 | 144 | // AllowedMergeModes are the modes with which a merge request of the | |
| 145 | 145 | // repository may be merged. It is never empty in a response and has no | |
| 146 | - | // duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed | |
| 147 | - | // by default; MERGE_MODE_MERGE_COMMIT is allowed only when listed. MERGE_MODE_UNSPECIFIED is rejected. | |
| 146 | + | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | |
| 147 | + | // rejected. | |
| 148 | 148 | AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.MergeMode" json:"allowed_merge_modes,omitempty"` | |
| 149 | 149 | // FailingChecksBlock says whether a merge request whose checks fail cannot be | |
| 150 | 150 | // merged. It is true at creation of the repository and always stored | |
| @@ -143,8 +143,8 @@ type RepoSettings struct { | |||||
| 143 | state protoimpl.MessageState `protogen:"open.v1"` | 143 | state protoimpl.MessageState `protogen:"open.v1"` | ||
| 144 | // AllowedMergeModes are the modes with which a merge request of the | 144 | // AllowedMergeModes are the modes with which a merge request of the | ||
| 145 | // repository may be merged. It is never empty in a response and has no | 145 | // repository may be merged. It is never empty in a response and has no | ||
| 146 | - | // duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed | 146 | + | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is |
| 147 | - | // by default; MERGE_MODE_MERGE_COMMIT is allowed only when listed. MERGE_MODE_UNSPECIFIED is rejected. | 147 | + | // rejected. |
| 148 | AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.MergeMode" json:"allowed_merge_modes,omitempty"` | 148 | AllowedMergeModes []MergeMode `protobuf:"varint,1,rep,packed,name=allowed_merge_modes,json=allowedMergeModes,proto3,enum=ermite.MergeMode" json:"allowed_merge_modes,omitempty"` | ||
| 149 | // FailingChecksBlock says whether a merge request whose checks fail cannot be | 149 | // FailingChecksBlock says whether a merge request whose checks fail cannot be | ||
| 150 | // merged. It is true at creation of the repository and always stored | 150 | // merged. It is true at creation of the repository and always stored | ||
M proto/ermite/repo.proto +2 -2
| @@ -37,8 +37,8 @@ enum IssuesMode { | |||
| 37 | 37 | message RepoSettings { | |
| 38 | 38 | // AllowedMergeModes are the modes with which a merge request of the | |
| 39 | 39 | // repository may be merged. It is never empty in a response and has no | |
| 40 | - | // duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed | |
| 41 | - | // by default; MERGE_MODE_MERGE_COMMIT is allowed only when listed. MERGE_MODE_UNSPECIFIED is rejected. | |
| 40 | + | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is | |
| 41 | + | // rejected. | |
| 42 | 42 | repeated MergeMode allowed_merge_modes = 1; | |
| 43 | 43 | // FailingChecksBlock says whether a merge request whose checks fail cannot be | |
| 44 | 44 | // merged. It is true at creation of the repository and always stored | |
| @@ -37,8 +37,8 @@ enum IssuesMode { | |||||
| 37 | message RepoSettings { | 37 | message RepoSettings { | ||
| 38 | // AllowedMergeModes are the modes with which a merge request of the | 38 | // AllowedMergeModes are the modes with which a merge request of the | ||
| 39 | // repository may be merged. It is never empty in a response and has no | 39 | // repository may be merged. It is never empty in a response and has no | ||
| 40 | - | // duplicate. Both MERGE_MODE_FAST_FORWARD and MERGE_MODE_SQUASH are allowed | 40 | + | // duplicate. Every mode is allowed by default. MERGE_MODE_UNSPECIFIED is |
| 41 | - | // by default; MERGE_MODE_MERGE_COMMIT is allowed only when listed. MERGE_MODE_UNSPECIFIED is rejected. | 41 | + | // rejected. |
| 42 | repeated MergeMode allowed_merge_modes = 1; | 42 | repeated MergeMode allowed_merge_modes = 1; | ||
| 43 | // FailingChecksBlock says whether a merge request whose checks fail cannot be | 43 | // FailingChecksBlock says whether a merge request whose checks fail cannot be | ||
| 44 | // merged. It is true at creation of the repository and always stored | 44 | // merged. It is true at creation of the repository and always stored | ||