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

Fix protected branch for API #24013

Merged
merged 3 commits into from
Apr 10, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 9, 2023

Fix #23998

@lunny lunny added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Apr 9, 2023
@lunny lunny added this to the 1.20.0 milestone Apr 9, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 9, 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 9, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 9, 2023
@techknowlogick techknowlogick enabled auto-merge (squash) April 10, 2023 01:19
@techknowlogick
Copy link
Member

🤖 🎺

@techknowlogick techknowlogick merged commit fd9d072 into go-gitea:main Apr 10, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 10, 2023
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 10, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 10, 2023
* upstream/main: (39 commits)
  Fix protected branch for API (go-gitea#24013)
  [skip ci] Updated translations via Crowdin
  Fix markdownlint (go-gitea#24024)
  Introduce lint-md and compliance-docs pipeline (go-gitea#24021)
  Fix https setup doc zh-cn (go-gitea#24015)
  Replace tribute with text-expander-element for textarea (go-gitea#23985)
  Improve GetBoards and getDefaultBoard (go-gitea#22981)
  Expand/Collapse all changed files (go-gitea#23639)
  Show errors for KaTeX and mermaid on the preview tab (go-gitea#24009)
  Show protected branch rule names again (go-gitea#23907)
  Reference the `zh-CN` version of `reverse-proxies` in `https-support` (go-gitea#24016)
  Fix lint problem in `https-support.zh-cn.md` (go-gitea#24014)
  docs: HTTPS configuration for zh-cn (go-gitea#23039)
  Re-add initial wiki page text when editing the page (go-gitea#23984)
  [skip ci] Updated translations via Crowdin
  fix: do not escape space between PyPI repository url and package name… (go-gitea#23981)
  Make bindata static build parse builtin templates correctly (go-gitea#24003)
  Group template helper functions, remove `Printf`, improve template error messages (go-gitea#23982)
  Adjust sticky pr header to cover background (go-gitea#23956)
  Update github.com/google/go-github to v51 (go-gitea#23946)
  ...
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 10, 2023
@lunny lunny deleted the lunny/fix_project_branch_api branch April 10, 2023 06:42
lunny added a commit that referenced this pull request Apr 10, 2023
Backport #24013 by @lunny

Fix #23998

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Branch protection duplicate key
5 participants