diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-04-15 11:29:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-15 11:29:42 +0800 |
| commit | 430fe6c0c14e6b6761f589cbef54a79b43a1445a (patch) | |
| tree | 131256405b278703c35f0b1400386b9e15249030 /templates | |
| parent | b6379d2f167551560c870d2d705269c9ba6fc3bc (diff) | |
| download | gitea-430fe6c0c14e6b6761f589cbef54a79b43a1445a.tar.gz gitea-430fe6c0c14e6b6761f589cbef54a79b43a1445a.zip | |
Avoid losing token when updating mirror settings (#30429) (#30466)
Fix #30416.
Backport #30429
Before (it shows as "Unset" while there's a token):
<img width="980" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/d7148e3e-62c9-4d2e-942d-3d795b79515a">
After:
<img width="977" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/24aaa1db-5baa-4204-9081-470b15ea72b5">
The username shows as "oauth2" because of
https://github.com/go-gitea/gitea/blob/f9fdac9809335729b2ac3227b2a5f71a62fc64ad/services/migrations/dump.go#L99
I have checked that all usage of `MirrorRemoteAddress` has been updated.
<img width="1806" alt="image"
src="https://github.com/go-gitea/gitea/assets/9418365/2f042501-2824-4511-9203-c84a6731a02d">
However, it needs to be checked again when backporting.
Co-authored-by: Jason Song <i@wolfogre.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/settings/options.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 6e7bd4ce4d..6761c0bd34 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -151,7 +151,7 @@ <label for="interval">{{ctx.Locale.Tr "repo.mirror_interval" .MinimumMirrorInterval}}</label> <input id="interval" name="interval" value="{{.PullMirror.Interval}}"> </div> - {{$address := MirrorRemoteAddress $.Context .Repository .PullMirror.GetRemoteName false}} + {{$address := MirrorRemoteAddress $.Context .Repository .PullMirror.GetRemoteName}} <div class="field {{if .Err_MirrorAddress}}error{{end}}"> <label for="mirror_address">{{ctx.Locale.Tr "repo.mirror_address"}}</label> <input id="mirror_address" name="mirror_address" value="{{$address.Address}}" required> |