Skip to content

Fix #5799 - swagger for mergePullRequest #5996

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

Merged
merged 2 commits into from
Feb 8, 2019
Merged

Conversation

xabufr
Copy link
Contributor

@xabufr xabufr commented Feb 7, 2019

Fixes #5799

Add missing definitions in swagger for merge pull request API.

@kolaente
Copy link
Member

kolaente commented Feb 7, 2019

CI failed

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 7, 2019
@sapk
Copy link
Member

sapk commented Feb 7, 2019

@xabufr the swagger .json file is a generated file.
You need to define the struct in comments of the go struct. Like https://github.com/go-gitea/gitea/blob/master/routers/api/v1/swagger/user.go#L33
And use the command make generate-swagger to generate the json file.

@xabufr
Copy link
Contributor Author

xabufr commented Feb 8, 2019

Indeed, I didn't see. Is it good now ?

@codecov-io
Copy link

codecov-io commented Feb 8, 2019

Codecov Report

Merging #5996 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5996      +/-   ##
==========================================
+ Coverage   38.76%   38.76%   +<.01%     
==========================================
  Files         332      332              
  Lines       48938    48942       +4     
==========================================
+ Hits        18971    18973       +2     
- Misses      27220    27222       +2     
  Partials     2747     2747
Impacted Files Coverage Δ
modules/auth/repo_form.go 39% <ø> (ø) ⬆️
routers/api/v1/repo/pull.go 17.7% <100%> (+0.57%) ⬆️
models/repo_list.go 63.29% <0%> (-1.27%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2e85e70...85b3ac1. Read the comment docs.

Copy link
Member

@sapk sapk left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution.

@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 Feb 8, 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 Feb 8, 2019
@zeripath zeripath merged commit 7fb09f0 into go-gitea:master Feb 8, 2019
type MergePullRequestForm struct {
// required: true
// enum: merge, rebase, rebase-merge, squash
Copy link
Member

Choose a reason for hiding this comment

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

This should have been without spaces to have correct values in swagger json

@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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

repoMergePullRequest Swagger not up-to-date
7 participants