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.

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

Fix org team endpoint #27721

Merged
merged 1 commit into from
Oct 21, 2023
Merged

Fix org team endpoint #27721

merged 1 commit into from
Oct 21, 2023

Conversation

lng2020
Copy link
Member

@lng2020 lng2020 commented Oct 21, 2023

Fix #27711

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 21, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 21, 2023
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Oct 21, 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 Oct 21, 2023
@6543 6543 added 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 Oct 21, 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 Oct 21, 2023
@6543 6543 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 21, 2023
@6543 6543 merged commit 1859bbb into go-gitea:main Oct 21, 2023
@GiteaBot GiteaBot added this to the 1.22.0 milestone Oct 21, 2023
@GiteaBot GiteaBot mentioned this pull request Oct 21, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 21, 2023
@lng2020 @GiteaBot
Fix org team endpoint (go-gitea#27721)
4001b4c 
Fix go-gitea#27711
@6543 6543 removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 21, 2023
lafriks pushed a commit that referenced this pull request Oct 22, 2023
@GiteaBot @lng2020
Fix org team endpoint (#27721) (#27727)
6919a02 
Backport #27721 by @lng2020

Fix #27711

Co-authored-by: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
@GiteaBot GiteaBot mentioned this pull request Oct 22, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 22, 2023
@lng2020 @GiteaBot
Fix org team endpoint (go-gitea#27721)
f1d3776 
Fix go-gitea#27711
@GiteaBot
Copy link
Collaborator

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

go run ./contrib/backport 27721
...  // 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 Oct 22, 2023
@lng2020
Copy link
Member Author

lng2020 commented Oct 22, 2023

GiteaBot always adds backport/manual even when the backport is done recently 👀 .

@lng2020 lng2020 removed the backport/manual No power to the bots! Create your backport yourself! label Oct 22, 2023
@GiteaBot
Copy link
Collaborator

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

go run ./contrib/backport 27721
...  // 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 Oct 22, 2023
@lunny lunny added the backport/done All backports for this PR have been created label Oct 22, 2023
6543 pushed a commit that referenced this pull request Oct 22, 2023
@GiteaBot @lng2020
Fix org team endpoint (#27721) (#27729)
71803d3 
Backport #27721 by @lng2020

Fix #27711

Co-authored-by: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 23, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
ea65a8c 
* upstream/main:
  Fix incorrect ctx usage in defer function (go-gitea#27740)
  Enable followCursor for language stats bar (go-gitea#27713)
  teams: new View button (go-gitea#27685)
  fix issues in translation file (go-gitea#27699)
  Fix an indentation in the Chinese documentation of Act Runner (go-gitea#27730)
  [skip ci] Updated translations via Crowdin
  Fix org team endpoint (go-gitea#27721)
  Improve diff tree spacing (go-gitea#27714)
  refactor: make db iterate context aware (go-gitea#27710)
  [FIX] resolve confusing colors in languages stats by insert a gap (go-gitea#27704)
  Fix sticky diff header background (go-gitea#27697)
  Replace -1 with GhostUserID (go-gitea#27703)
  Clean some functions about project issue (go-gitea#27705)
@lng2020 lng2020 deleted the fix_team_token branch November 7, 2023 07:49
@lng2020 lng2020 removed the backport/manual No power to the bots! Create your backport yourself! label Nov 12, 2023
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
@lng2020 @fuxiaohei
Fix org team endpoint (go-gitea#27721)
928de95 
Fix go-gitea#27711
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.20 This PR should be backported to Gitea 1.20 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. modifies/api This PR adds API routes or modifies them size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Unable to get teams information using /orgs/{org}/teams?page={page}&limit={limit}
5 participants
@lng2020 @GiteaBot @6543 @delvh @lunny