Codeberg-Infrastructure/forgejo
26
171
Fork 35
Code Issues Pull requests Releases Activity

Implement ghost comment mitigation #9

Closed
momar wants to merge 10 commits from Codeberg/Discussion#24 into codeberg-test
pull from: Codeberg/Discussion#24
merge into: Codeberg-Infrastructure:codeberg-test
Conversation 13 Commits 10 Files changed 24 +174 -86
Image
Image momar commented 2020-12-14 10:04:54 +01:00
Member
Copy link

Adds a config option USER_DELETE_WITH_COMMENTS_MAX_DAYS to the [service] section.

Adds a config option USER_DELETE_WITH_COMMENTS_MAX_DAYS to the [service] section.
👍 2 
Adds a config option USER_DELETE_WITH_COMMENTS_MAX_DAYS to the [service] section. See Codeberg/Discussion#24 for the underlying issue.
Image 6543 reviewed 2020-12-14 11:24:16 +01:00
models/user.go
@ -1132,6 +1132,17 @@ func deleteUser(e *xorm.Session, u *User) error {
return fmt.Errorf("deleteBeans: %v", err)
}
if section, err := setting.Cfg.GetSection("service"); err == nil {
Image 6543 commented 2020-12-14 11:24:16 +01:00
Member
Copy link

this should go into modules/setting/service.go as for example
AUTO_WATCH_ON_CHANGES

this should go into modules/setting/service.go as for example `AUTO_WATCH_ON_CHANGES`
Image hw commented 2020-12-14 21:23:18 +01:00
Member
Copy link

Thank you for having a look! Is there interest to merge this upstream, too?

Thank you for having a look! Is there interest to merge this upstream, too?
Image
Image ashimokawa commented 2020-12-14 22:27:49 +01:00
Owner
Copy link

This PR broke when I force pushed to codeberg-test, thats not good - sorry, I rebased the latest commits from upstream

This PR broke when I force pushed to codeberg-test, thats not good - sorry, I rebased the latest commits from upstream
Image
Image ashimokawa commented 2020-12-14 22:33:00 +01:00
Owner
Copy link

Is this expected to happen?

Is this expected to happen?
Image
Image 6543 commented 2020-12-15 01:46:58 +01:00
Member
Copy link

I think this should be added upstream first ... but it can be cherry picked fom codeberg too, if merged the right way ...

I think this should be added upstream first ... but it can be cherry picked fom codeberg too, if merged the right way ...
Image
Image ashimokawa commented 2020-12-15 15:51:57 +01:00
Owner
Copy link

Even cooler if this will be upstream.
Anyone know a trick how to fix this PR (the damage I did with force pushing)

Even cooler if this will be upstream. Anyone know a trick how to fix this PR (the damage I did with force pushing)
Image
Image momar commented 2020-12-15 16:02:42 +01:00
Author
Member
Copy link

I can look at this tomorrow

I can look at this tomorrow
Image
Image 6543 commented 2021-01-15 12:57:15 +01:00
Member
Copy link

I'll try to cerry-pick and get it in upstream

I'll try to cerry-pick and get it in upstream
Image
Image 6543 commented 2021-01-15 13:34:13 +01:00
Member
Copy link

https://github.com/go-gitea/gitea/pull/14349

EDIT: STATE: finished it ... waiting for reviews ...

https://github.com/go-gitea/gitea/pull/14349 EDIT: STATE: finished it ... waiting for reviews ...
❤️ 2 🚀 1
Image
Image 6543 commented 2021-01-17 21:49:50 +01:00
Member
Copy link

@hw @ashimokawa can be cherry pick

@hw @ashimokawa can be cherry pick
👍 1
Image
Image ashimokawa commented 2021-01-18 20:09:10 +01:00
Owner
Copy link

@6543

Cherry-picked and deployed on codeberg-test, set to 7 days, ready for testing!

@6543 Cherry-picked and deployed on codeberg-test, set to 7 days, ready for testing!
👍 1
Image
Image ashimokawa commented 2021-01-18 20:43:57 +01:00
Owner
Copy link

@6543

Seems to work!
The "cleanup" commit which removes the German translation is because that should be done with the official way of translating?

I could remove that commit to make german work again.

@6543 Seems to work! The "cleanup" commit which removes the German translation is because that should be done with the official way of translating? I could remove that commit to make german work again.
Image
Image 6543 commented 2021-01-18 21:57:36 +01:00
Member
Copy link

@ashimokawa yes you could add a reverted https://github.com/go-gitea/gitea/pull/14349/commits/9d767ff6ef9f668bfd22276c9b20dbbd335ff6d7 for codeberg ...

@ashimokawa yes you could add a reverted https://github.com/go-gitea/gitea/pull/14349/commits/9d767ff6ef9f668bfd22276c9b20dbbd335ff6d7 for codeberg ...
Image
Image ashimokawa commented 2021-01-20 11:41:26 +01:00
Owner
Copy link

Closing this in favor of #11

Closing this in favor of #11
Image ashimokawa closed this pull request 2021-01-20 11:41:26 +01:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Image Image Image Image
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Codeberg-Infrastructure/forgejo!9
No description provided.