1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-01 09:51:39 -05:00
forgejo/routers/web
Giteabot ee87a652e9
Editor error message misleading due to re-used key. (#29859) (#29876)
Backport #29859 by @buckybytes

The error message:

`editor.file_changed_while_editing = The file contents have changed
since you started editing. <a target="_blank" rel="noopener noreferrer"
href="%s">Click here</a> to see them or <strong>Commit Changes
again</strong> to overwrite them.`

Is re-used in inappropriate contexts. The link in the key goes to a 404
when the key is used in a situation where the file contents have not
changed.

Added two new keys to differentiate commit id mismatch and push out of
date conditions.

Co-authored-by: buckybytes <158571971+buckybytes@users.noreply.github.com>
(cherry picked from commit 00ea9af8e118790a186b4cf78a0ce85ce986bf1d)
2024-03-21 17:09:50 +01:00
..
admin Forbid removing the last admin user (#28337) (#28793) 2024-01-16 14:41:11 +00:00
auth [GITEA] rework long-term authentication 2024-01-16 14:14:46 +00:00
devtest Make "cancel" buttons have proper type in modal forms (#25618) 2023-07-03 14:04:50 +08:00
events Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
explore Only use supported sort order for "explore/users" page (#29430) (#29443) 2024-03-10 18:45:59 +07:00
feed Rework markup link rendering (#26745) (#28803) 2024-01-16 14:41:11 +00:00
healthcheck [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2023-11-13 13:58:17 +01:00
misc Refactor CORS handler (#28587) (#28611) 2024-01-16 14:08:38 +00:00
org Rework markup link rendering (#26745) (#28803) 2024-01-16 14:41:11 +00:00
repo Editor error message misleading due to re-used key. (#29859) (#29876) 2024-03-21 17:09:50 +01:00
shared Fix project counter in organization/individual profile (#28068) (#29361) 2024-03-06 12:20:42 +08:00
user Fix 500 when deleting account with incorrect password or unsupported login type (#29579) (#29656) 2024-03-10 18:45:59 +07:00
base.go Fix panic in storageHandler (#27446) (#27479) 2023-10-06 16:51:26 +02:00
githttp.go Refactor CORS handler (#28587) (#28611) 2024-01-16 14:08:38 +00:00
goget.go Support SSH for go get (#24664) 2023-05-12 09:44:37 +00:00
home.go [GITEA] rework long-term authentication 2024-01-16 14:14:46 +00:00
metrics.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
nodeinfo.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
swagger_json.go Start using template context function (#26254) 2023-08-08 01:22:47 +00:00
web.go Use Get but not Post to get actions artifacts (#29734) (#29737) 2024-03-21 09:25:14 +01:00
webfinger.go Add a link to OpenID Issuer URL in WebFinger response (#26000) 2023-07-20 16:02:45 +08:00