Skip to content

Add protected branch name description #27257

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
Merged
merged 3 commits into from
Sep 29, 2023
Merged

Add protected branch name description #27257

merged 3 commits into from
Sep 29, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Sep 25, 2023

No description provided.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 25, 2023
@lunny lunny added the type/docs This PR mainly updates/creates documentation label Sep 25, 2023
@github-actions github-actions bot removed the type/docs This PR mainly updates/creates documentation label Sep 25, 2023
@lunny lunny added type/docs This PR mainly updates/creates documentation backport/v1.20 This PR should be backported to Gitea 1.20 backport/v1.21 This PR should be backported to Gitea 1.21 labels Sep 25, 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 Sep 27, 2023
@lunny @delvh
Update options/locale/locale_en-US.ini
5170e54 
Co-authored-by: delvh <dev.lh@web.de>
@github-actions github-actions bot removed the type/docs This PR mainly updates/creates documentation label Sep 28, 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 Sep 29, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 29, 2023
@silverwind silverwind enabled auto-merge (squash) September 29, 2023 13:11
delvh
delvh approved these changes Sep 29, 2023
View reviewed changes
Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd still prefer it if we would inject the link dynamically, but the current approach is fine too.

@lunny lunny added the type/docs This PR mainly updates/creates documentation label Sep 29, 2023
@silverwind silverwind merged commit c3b7231 into go-gitea:main Sep 29, 2023
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 29, 2023
@GiteaBot GiteaBot mentioned this pull request Sep 29, 2023
Closed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 29, 2023
@lunny @delvh @GiteaBot
Add protected branch name description (go-gitea#27257)
0ac4028 
Co-authored-by: delvh <dev.lh@web.de>
@GiteaBot GiteaBot mentioned this pull request Sep 29, 2023
Merged
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 29, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 29, 2023
@lunny @delvh @GiteaBot
Add protected branch name description (go-gitea#27257)
ca8238e 
Co-authored-by: delvh <dev.lh@web.de>
silverwind pushed a commit that referenced this pull request Sep 29, 2023
@GiteaBot @lunny @delvh
Add protected branch name description (#27257) (#27351)
f9395ea 
Backport #27257 by @lunny

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.21. @lunny, please send one manually. 🍵

go run ./contrib/backport 27257
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Sep 29, 2023
@lunny lunny removed the backport/v1.20 This PR should be backported to Gitea 1.20 label Sep 30, 2023
@lunny lunny deleted the lunny/add_protected_branch_desc branch September 30, 2023 03:12
@lng2020 lng2020 added backport/done All backports for this PR have been created and removed backport/manual No power to the bots! Create your backport yourself! labels Nov 12, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@delvh delvh delvh approved these changes

@lng2020 lng2020 lng2020 approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lunny @GiteaBot @silverwind @delvh @lng2020