Skip to content

Do not show delete button when time tracker is disabled (#29257)#29279

Merged
KN4CK3R merged 2 commits into
go-gitea:release/v1.21from
Zettat123:backport-29257-to-1.21
Feb 20, 2024
Merged

Do not show delete button when time tracker is disabled (#29257)#29279
KN4CK3R merged 2 commits into
go-gitea:release/v1.21from
Zettat123:backport-29257-to-1.21

Conversation

@Zettat123
Copy link
Copy Markdown
Contributor

@Zettat123 Zettat123 commented Feb 20, 2024

Backport #29257
Fix #29233

The delete button of time logs won't be shown when the time tracker is disabled.

image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 20, 2024
@GiteaBot GiteaBot added this to the 1.21.6 milestone Feb 20, 2024
@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 Feb 20, 2024
@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 Feb 20, 2024
@KN4CK3R KN4CK3R enabled auto-merge (squash) February 20, 2024 08:50
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 20, 2024
@KN4CK3R KN4CK3R merged commit e940443 into go-gitea:release/v1.21 Feb 20, 2024
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 20, 2024
@github-actions
Copy link
Copy Markdown
Contributor

Automatically locked because of our CONTRIBUTING guidelines

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Feb 28, 2024
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. type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants