detached 788238f

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 VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
2 files · +4 -4
M gen/ermite/repo.pb.go +2 -2 generated file: collapsed
M proto/ermite/repo.proto +2 -2
@@ -37,8 +37,8 @@ enum IssuesMode {
3737 message RepoSettings {
3838 // AllowedMergeModes are the modes with which a merge request of the
3939 // 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.
4242 repeated MergeMode allowed_merge_modes = 1;
4343 // FailingChecksBlock says whether a merge request whose checks fail cannot be
4444 // 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 the38 // 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 no39 // 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 allowed40+ // 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 be43 // FailingChecksBlock says whether a merge request whose checks fail cannot be
44 // merged. It is true at creation of the repository and always stored44 // merged. It is true at creation of the repository and always stored

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 2

Tags 18

↑↓ moveenter openesc close