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

Add admin API route for managing user's badges #23106

Merged
merged 25 commits into from
Mar 1, 2024
Merged

Add admin API route for managing user's badges #23106

merged 25 commits into from
Mar 1, 2024

Conversation

techknowlogick
Copy link
Member

Fix #22785

@techknowlogick techknowlogick added type/feature Completely new functionality. Can only be merged if feature freeze is not active. pr/wip This PR is not ready for review modifies/api This PR adds API routes or modifies them labels Feb 24, 2023
@techknowlogick techknowlogick added this to the 1.20.0 milestone Feb 24, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 24, 2023
wxiaoguang
wxiaoguang reviewed Feb 24, 2023
View reviewed changes
models/user/badge.go Outdated Show resolved Hide resolved
@techknowlogick techknowlogick mentioned this pull request Mar 3, 2023
Merged
@techknowlogick techknowlogick marked this pull request as ready for review March 3, 2023 05:37
@techknowlogick techknowlogick removed the pr/wip This PR is not ready for review label Mar 3, 2023
lunny
lunny reviewed Mar 3, 2023
View reviewed changes
models/user/badge.go Outdated Show resolved Hide resolved
@silverwind silverwind mentioned this pull request Apr 28, 2023
Merged
4 tasks
@delvh delvh removed this from the 1.20.0 milestone Jun 4, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 9, 2023
@github-actions github-actions bot removed the modifies/api This PR adds API routes or modifies them label Sep 9, 2023
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Sep 9, 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 13, 2023
delvh
delvh reviewed Sep 13, 2023
View reviewed changes
routers/api/v1/api.go Show resolved Hide resolved
modules/structs/user.go Outdated Show resolved Hide resolved
models/migrations/v1_21/v276.go Outdated Show resolved Hide resolved
models/migrations/v1_21/v276.go Outdated Show resolved Hide resolved
models/user/badge.go Outdated Show resolved Hide resolved
models/user/badge.go Outdated Show resolved Hide resolved
lunny
lunny reviewed Sep 14, 2023
View reviewed changes
models/user/badge.go Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 29, 2024
techknowlogick and others added 3 commits February 29, 2024 18:14
@techknowlogick @lunny
Update v287.go
d749ffa 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@techknowlogick @lunny
Update user_badge.go
3d0547a 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@techknowlogick
make generate-swagger
56fd7e7
@techknowlogick
Copy link
Member Author

thanks @lunny, I've added your suggestions

@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 Mar 1, 2024
@lunny lunny added this to the 1.22.0 milestone Mar 1, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 1, 2024
@techknowlogick techknowlogick merged commit cb52b17 into go-gitea:main Mar 1, 2024
26 checks passed
@techknowlogick techknowlogick deleted the badge-api branch March 1, 2024 08:23
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 1, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 1, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
2095f08 
* giteaofficial/main:
  Set pre-step status to `skipped` if job is skipped (go-gitea#29489)
  Use a predictiable fork URL to allow forking repositories without providing a repo ID (go-gitea#29519)
  Adding back missing options to app.example.ini (go-gitea#29511)
  Refactor the "attachments" sub-template data key to RenderedContent (go-gitea#29517)
  Rename Str2html to SanitizeHTML and clarify its behavior (go-gitea#29516)
  Add admin API route for managing user's badges (go-gitea#23106)
  Refactor some Str2html code (go-gitea#29397)
  Move migration functions to services layer (go-gitea#29497)
@wxiaoguang
Copy link
Contributor

Due to the bug of CI/test, the test failures are never caught:

image

@techknowlogick techknowlogick mentioned this pull request Mar 5, 2024
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 13, 2024
@silverwind
Copy link
Member

silverwind commented Mar 14, 2024 •
edited
Loading

There was another failure in lint-swagger seemingly caused by this, see #29787.

I wonder how it had slipped through the CI because it did pass right before merge:

https://github.com/go-gitea/gitea/actions/runs/8108256904/job/22161162430

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh left review comments

@wxiaoguang wxiaoguang wxiaoguang left review comments

@silverwind silverwind silverwind approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
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 modifies/migrations size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Implement web API for user badges
6 participants
@techknowlogick @wxiaoguang @silverwind @lunny @delvh @GiteaBot