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

hide delete/restore button on archived repos [backport] #7660

Conversation

6543
Copy link
Member

@6543 6543 commented Jul 29, 2019

close issue #7653

backport of #7658

templates/repo/branch/list.tmpl Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 29, 2019
@lunny lunny added the type/bug label Jul 29, 2019
@lunny lunny added this to the 1.9.0 milestone Jul 29, 2019
@6543
Copy link
Member Author

6543 commented Jul 29, 2019

ok should be ready now

@6543
Copy link
Member Author

6543 commented Jul 29, 2019

version 1.9 sufferst also #7625 i can backport the quic fix there also ...

@6543
Copy link
Member Author

6543 commented Jul 29, 2019

@lunny it depends on you wich parts are backported just tell me your desision

@lunny
Copy link
Member

lunny commented Jul 29, 2019

Could we move the protected icon to the first column of the table?

@6543
Copy link
Member Author

6543 commented Jul 29, 2019

Could we move the protected icon to the first column of the table?

so backport parts of #7461 ok

@6543 6543 changed the title hide delete/restore button on archived repos hide delete/restore button on archived repos [backport] Jul 29, 2019
@6543
Copy link
Member Author

6543 commented Jul 29, 2019

ok this should work fine

@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 Jul 29, 2019
@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 Jul 29, 2019
@6543
Copy link
Member Author

6543 commented Jul 29, 2019

EDIT: We have to find the bug of #7576 first

it is also very relevant for 1.10 and so on but 1.9 get released first ...

@lafriks lafriks merged commit 0a9794a into go-gitea:release/v1.9 Jul 29, 2019
@lafriks
Copy link
Member

lafriks commented Jul 29, 2019

Sorry already merged :/ let's do the long walk and fix master first :)

@6543 6543 deleted the branch-view-archive-dont-delete-backport branch July 29, 2019 23:38
@6543
Copy link
Member Author

6543 commented Jul 30, 2019

Sorry already merged :/ let's do the long walk and fix master first :)

it is fixed in master because of other improvements
this hase to be backported also ... i come to the same solution ...

@6543
Copy link
Member Author

6543 commented Jul 30, 2019

@lafriks #7668 will fix @gary-kim conzerns (it is already fixed in master)

lunny pushed a commit that referenced this pull request Jul 30, 2019
* backport issue showing portection symbol if needet at default branch

* sugestion to use range .Branches
https://github.com/go-gitea/gitea/pull/7668/files/d57973a8041a741fdb7e77bc6ab18431bbf95ba4
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
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.

None yet

6 participants