Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Web UI Merge Dialog Enter Should Submit #8781

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Fix Web UI Merge Dialog Enter Should Submit #8781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions webui/src/lib/components/repository/compareBranchesActionBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const CompareBranchesActionsBar = (
compareReference={compareReference}
baseSelectURL={baseSelectURL}
withCommits={true}
/>
/>
</ActionGroup>

<ActionGroup orientation="right">
Expand Down Expand Up @@ -105,7 +105,17 @@ const MergeButton = ({repo, onDone, source, dest, disabled = false}) => {
<Modal.Body>
<Form className="mb-2">
<Form.Group controlId="message" className="mb-3">
<Form.Control type="text" placeholder="Commit Message (Optional)" ref={textRef}/>
<Form.Control
type="text"
placeholder="Commit Message (Optional)"
ref={textRef}
onKeyDown={(e) => {
if (e.key === 'Enter' && !e.shiftKey) {
e.preventDefault();
onSubmit();
}
}}
/>
</Form.Group>

<MetadataFields metadataFields={metadataFields} setMetadataFields={setMetadataFields}/>
Expand Down
Loading