Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More detailed branch delete message #22696

Merged
merged 4 commits into from
Apr 28, 2023
Merged

More detailed branch delete message #22696

merged 4 commits into from
Apr 28, 2023

Conversation

kernie
Copy link
Contributor

@kernie kernie commented Jan 31, 2023

Fix #22624 . Message explains that deleted branch can only be restored for a short time period.

@zeripath
Copy link
Contributor

zeripath commented Jan 31, 2023

I think perhaps this should just be a warning of this might not be possible to undo instead?

The proposed change appears even more likely to make people confused.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 31, 2023
@kernie
Copy link
Contributor Author

kernie commented Feb 1, 2023

What about
Deleting a branch is permanent. It can only be undone shortly after the deletion. Continuue?

@a1012112796
Copy link
Member

we can load this config value by backend directly, is't it? so I think we can show Deleting a branch is permanent. It can only be undone in %d days. Continuue?

@kernie
Copy link
Contributor Author

kernie commented Feb 2, 2023

I like that! It gives exact information without disturbing the user with technical details.

@wxiaoguang
Copy link
Contributor

I think it's good to use the most strict warning for end users, do not make users expect some lucky miracle.

For example, what about the git cleanup task is scheduled to run in next minute?

So I'd like to keep the old wording. Users should keep in mind they shouldn't expect a deleted branch could be recovered.

@wxiaoguang wxiaoguang added the issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail label Apr 25, 2023
@kernie
Copy link
Contributor Author

kernie commented Apr 25, 2023

I support a strict wording! However, I tiny hint that the repo is scheduled for removal helps understand that it does not disappear immediately...

I don't think we need to spend more time for this issue since the gain is minimal. Please accept or reject to your liking.

Thanks

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 27, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 27, 2023
@wxiaoguang wxiaoguang removed the issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail label Apr 27, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 28, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 28, 2023
@lunny lunny merged commit ad03c6e into go-gitea:main Apr 28, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone Apr 28, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 28, 2023
@kernie kernie deleted the patch-1 branch April 28, 2023 06:59
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Contradictory messages when deleting branch
6 participants