troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-28 05:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
forgejo/routers/api/v1
History
metiftikci ca0921a95a
Prevent simultaneous editing of comments and issues (#31053) 
fixes #22907

Tested:
- [x] issue content edit
- [x] issue content change tasklist
- [x] pull request content edit
- [x] pull request change tasklist

![issue-content-edit](https://github.com/go-gitea/gitea/assets/29250154/a0828889-fb96-4bc4-8600-da92e3205812)

(cherry picked from commit aa92b13164e84c26be91153b6022220ce0a27720)

Conflicts:
	models/issues/comment.go
	 c7a389f2b2 [FEAT] allow setting the update date on issues and comments

	options/locale/locale_en-US.ini
	 trivial context conflicts

	routers/api/v1/repo/issue_comment.go
	routers/api/v1/repo/issue_comment_attachment.go
	services/issue/comments.go
	services/issue/content.go
         user blocking is implemented differently in Forgejo

	routers/web/repo/issue.go
	 trivial difference from 6a0750177f Allow to save empty comment
         user blocking is implemented differently in Forgejo

	templates/repo/issue/view_content/conversation.tmpl
	 templates changed a lot in Forgejo but the change is
	 trivially ported

	tests/integration/issue_test.go
	 other tests were added in the same region

	web_src/js/features/repo-issue-edit.js
	 the code is still web_src/js/features/repo-legacy.js
	 trivially ported
2024-06-02 16:26:54 +02:00
..
activitypub add more integration testcases 2024-05-21 18:49:31 +02:00
admin Fix empty field login_name in API response JSON when creating user (#30511) 2024-04-21 11:59:16 +02:00
misc Port "Fix wrong test usage of AppSubURL" 2024-03-06 21:47:44 +01:00
notify drop log.Error in ReadRepoNotifications 2024-03-24 07:12:31 +01:00
org Fix bug on avatar (#31008) 2024-05-19 13:57:52 +02:00
packages remove util.OptionalBool and related functions (#29513) 2024-03-06 12:10:46 +08:00
repo Prevent simultaneous editing of comments and issues (#31053) 2024-06-02 16:26:54 +02:00
settings Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
shared Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
swagger Merge pull request '[gitea] week 2024-19 cherry pick (gitea-github/main -> forgejo)' (#3639) from earl-warren/wcp/2024-19 into forgejo 2024-05-07 22:47:53 +00:00
user Fix bug on avatar (#31008) 2024-05-19 13:57:52 +02:00
utils Move context from modules to services (#29440) 2024-03-06 12:10:43 +08:00
api.go Merge pull request '[gitea] week 2024-19 cherry pick (gitea-github/main -> forgejo)' (#3639) from earl-warren/wcp/2024-19 into forgejo 2024-05-07 22:47:53 +00:00