troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 20:59:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
forgejo/services
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
..
actions Improve the handling of jobs.<job_id>.if (#31070) 2024-06-02 09:08:07 +02:00
agit
asymkey Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
attachment
auth Fix tautological conditions (#30735) 2024-05-05 08:59:40 +01:00
automerge Fix automerge will not work because of some events haven't been triggered (#30780) 2024-05-26 19:01:36 +02:00
context ui for adding following repos 2024-05-24 13:28:15 +02:00
contexttest Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-12 20:03:10 +02:00
convert Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
cron
doctor Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
externalaccount
federation lint 2024-05-24 13:38:43 +02:00
feed
forgejo
forms Rename project board -> column to make the UI less confusing (#30170) 2024-06-02 09:42:39 +02:00
gitdiff Refactor sha1 and time-limited code (#31023) 2024-05-26 18:43:30 +02:00
indexer Update issue indexer after merging a PR (#30715) 2024-05-12 20:03:10 +02:00
issue Prevent simultaneous editing of comments and issues (#31053) 2024-06-02 16:26:54 +02:00
lfs
mailer Merge pull request 'mailer: Switch X-Mailer to "Forgejo"' (#3931) from algernon/forgejo:mailer-detox into forgejo 2024-05-28 17:51:04 +00:00
markup
migrations Merge pull request 'migrations: Map non-existant external users to Ghost' (#3935) from algernon/forgejo:who-let-the-nils-out into forgejo 2024-05-28 16:42:31 +00:00
mirror Resolve lint for unused parameter and unnecessary type arguments (#30750) 2024-05-05 08:38:16 +01:00
notify Clean up log messages (#30313) 2024-04-15 20:01:35 +02:00
org
packages
pull Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-12 20:03:10 +02:00
release Fix release published actions not triggering for releases created from existing tags 2024-04-15 22:53:53 +02:00
remote Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
repository Merge branch 'forgejo' into forgejo-federated-pr5 2024-05-29 18:26:16 +02:00
secrets
task Fix "force private" logic (#31012) 2024-05-26 18:20:33 +02:00
uinotification
user ui for adding following repos 2024-05-24 13:28:15 +02:00
webhook chore: fix typos identified by mispell 2024-05-25 09:43:50 +02:00
wiki feat: wiki search using git-grep 2024-05-20 13:48:50 +00:00