Skip to content

Commit 35dfe22

Browse files
committed
Merge remote-tracking branch 'origin/main' into forgefriends-mr46
2 parents bfde68d + 2b5e013 commit 35dfe22

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

routers/web/repo/http.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,9 @@ func serviceRPC(ctx gocontext.Context, h serviceHandler, service string) {
495495
Stdin: reqBody,
496496
Stderr: &stderr,
497497
}); err != nil {
498-
log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())
498+
if err.Error() != "signal: killed" {
499+
log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())
500+
}
499501
return
500502
}
501503
}

templates/admin/auth/edit.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<div class="inline required field {{if .Err_SecurityProtocol}}error{{end}}">
2828
<label>{{.i18n.Tr "admin.auths.security_protocol"}}</label>
2929
<div class="ui selection security-protocol dropdown">
30-
<input type="hidden" id="security_protocol" name="security_protocol" value="{{$cfg.SecurityProtocol}}">
30+
<input type="hidden" id="security_protocol" name="security_protocol" value="{{$cfg.SecurityProtocol.Int}}">
3131
<div class="text">{{$cfg.SecurityProtocolName}}</div>
3232
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
3333
<div class="menu">

web_src/js/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ import {initRepoCommentForm, initRepository} from './features/repo-legacy.js';
7878

7979
// Silence fomantic's error logging when tabs are used without a target content element
8080
$.fn.tab.settings.silent = true;
81+
// Disable the behavior of fomantic to toggle the checkbox when you press enter on a checkbox element.
82+
$.fn.checkbox.settings.enableEnterKey = false;
8183

8284
initVueEnv();
8385

0 commit comments

Comments
 (0)