magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-25 19:26:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
forgejo/routers/web/repo
History
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
..
actions Not trigger all jobs any more, when re-running the first job (#29439) (#29441) 2024-03-10 18:06:44 +07:00
setting Preserve BOM in web editor (#28935) (#28959) 2024-01-31 14:18:26 +01:00
activity.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
attachment.go More refactoring of db.DefaultContext (#27083) 2023-09-15 06:13:19 +00:00
blame.go Use information from previous blame parts (#28572) (#28577) 2023-12-22 12:10:03 +01:00
branch.go Also sync DB branches on push if necessary (#28361) (#28403) 2023-12-12 15:21:33 +01:00
cherry_pick.go Sync branches into databases (#22743) 2023-06-29 10:03:20 +00:00
commit.go Preserve BOM in web editor (#28935) (#28959) 2024-01-31 14:18:26 +01:00
compare.go Preserve BOM in web editor (#28935) (#28959) 2024-01-31 14:18:26 +01:00
download.go Less naked returns (#25713) 2023-07-07 05:31:56 +00:00
editor.go Editor error message misleading due to re-used key. (#29859) (#29876) 2024-03-21 17:09:50 +01:00
editor_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
find.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
githttp.go Fix http protocol auth (#27875) (#27876) 2023-11-02 16:34:55 +01:00
githttp_test.go Fix http protocol auth (#27875) (#27876) 2023-11-02 16:34:55 +01:00
helper.go Improve tree not found page (#26570) (#27346) 2023-09-29 18:35:11 +08:00
helper_test.go Make web context initialize correctly for different cases (#26726) 2023-08-25 19:07:42 +08:00
issue.go Rework markup link rendering (#26745) (#28803) 2024-01-16 14:41:11 +00:00
issue_content_history.go [GITEA] Fix panic in canSoftDeleteContentHistory 2024-01-13 22:05:35 +01:00
issue_dependency.go Add context parameter to some database functions (#26055) 2023-07-22 22:14:27 +08:00
issue_label.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
issue_label_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
issue_lock.go Use fetch form action for lock/unlock/pin/unpin on sidebar (#25380) 2023-06-29 04:16:04 +00:00
issue_pin.go Fix missing check (#28406) (#28411) 2023-12-12 15:21:32 +01:00
issue_stopwatch.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
issue_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
issue_timetrack.go Add context parameter to some database functions (#26055) 2023-07-22 22:14:27 +08:00
issue_watch.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
main_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
middlewares.go Fix viewing wiki commit on empty repo (#28040) (#28044) 2023-11-22 17:11:57 +01:00
migrate.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
milestone.go Rework markup link rendering (#26745) (#28803) 2024-01-16 14:41:11 +00:00
packages.go Fix the display of org level badges (#26504) 2023-09-06 14:38:14 +08:00
patch.go Sync branches into databases (#22743) 2023-06-29 10:03:20 +00:00
projects.go Rework markup link rendering (#26745) (#28803) 2024-01-16 14:41:11 +00:00
projects_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
pull.go [BUG] Display error message if doer is unable to fork 2024-03-15 15:14:28 +01:00
pull_review.go [BUG] split code conversations in diff tab (#2306) 2024-02-16 14:06:43 +01:00
release.go Rework markup link rendering (#26745) (#28803) 2024-01-16 14:41:11 +00:00
release_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00
render.go Preserve BOM in web editor (#28935) (#28959) 2024-01-31 14:18:26 +01:00
repo.go [GITEA] Handle non-existant commit in Archive request 2024-01-04 23:56:33 +01:00
search.go Refactor indexer (#25174) 2023-06-23 12:37:56 +00:00
topic.go Next round of db.DefaultContext refactor (#27089) 2023-09-16 14:39:12 +00:00
treelist.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
view.go Preserve BOM in web editor (#28935) (#28959) 2024-01-31 14:18:26 +01:00
view_test.go Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
wiki.go Rework markup link rendering (#26745) (#28803) 2024-01-16 14:41:11 +00:00
wiki_test.go Move web/api context related testing function into a separate package (#26859) 2023-09-01 11:26:07 +00:00