Skip to content

Contradictory messages when deleting branch #22624

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.

Sign up for GitHub

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

Jump to bottom
Closed
kernie opened this issue Jan 27, 2023 · 3 comments · Fixed by #22696
Closed

Contradictory messages when deleting branch #22624

kernie opened this issue Jan 27, 2023 · 3 comments · Fixed by #22696
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail type/bug

Comments

@kernie
Copy link
Contributor

kernie commented Jan 27, 2023

Description

When I delete a branch on the Code -> Branch tab, a message pops up that this delete is permanent and cannot be redone.

After confirming I see the image below where I can restore the branch...

grafik

Whether or not this might work it would be better to have a more consistent wording.

By the way thanks for this great software!

Gitea Version

1.18.3

Can you reproduce the bug on the Gitea demo site?

Yes

Log Gist

No response

Screenshots

No response

Git Version

No response

Operating System

Ubuntu 18.04

How are you running Gitea?

Manual server installation with systemd

Database

MySQL
@lunny
Copy link
Member

lunny commented Jan 30, 2023

It can be reverted in a very short time.

@kernie
Copy link
Contributor Author

kernie commented Jan 31, 2023

According to discussion at Crowdin (in German) for repo:branch.delete_desc there is a proposal to change it into:

"Deleting a branch is permanent after 'git cleanup task' was run (by default once per day). It CANNOT be undone. Continue?"

Is options/locale/locale_en-US.ini the right place to create a pull request?

@kernie kernie mentioned this issue Jan 31, 2023
Merged
@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
@wxiaoguang
Copy link
Contributor

Per #22696 (comment)

lunny pushed a commit that referenced this issue Apr 28, 2023
@kernie
More detailed branch delete message (#22696)
ad03c6e 
Fix #22624 . Message explains that deleted branch can only be restored for a short time period.
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 14, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

More detailed branch delete message
3 participants
@lunny @wxiaoguang @kernie