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 PR creation via api between branches of same repo with head field namespaced #26986

Merged
merged 24 commits into from Mar 17, 2024

Conversation

norohind
Copy link
Contributor

@norohind norohind commented Sep 9, 2023

Fix #20175

Current implementation of API does not allow creating pull requests between branches of the same
repo when you specify namespace (owner of the repo) in head field in http request body.


Although GitHub implementation of API allows performing such action and since Gitea targeting
compatibility with GitHub API I see it as an appropriate change.

I'm proposing a fix to the described problem and test case which covers this logic.

My use-case just in case: #20175 (comment)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 9, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 9, 2023
@silverwind silverwind added the modifies/api This PR adds API routes or modifies them label Sep 9, 2023
@choelzl
Copy link

choelzl commented Nov 15, 2023

Sorry for the ping/bump, having automated PR creation in various projects (release, deployment, dependency, syntax,...) it would be nice seeing it resolved.

@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 Nov 19, 2023
@lunny lunny added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Nov 19, 2023
@lunny lunny added this to the 1.22.0 milestone Nov 19, 2023
@lunny
Copy link
Member

lunny commented Mar 15, 2024

last call for this one. @go-gitea/technical-oversight-committee

@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 15, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 15, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 15, 2024
@lunny lunny enabled auto-merge (squash) March 15, 2024 10:21
@yardenshoham
Copy link
Member

Tests are failing

@yardenshoham yardenshoham removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 16, 2024
auto-merge was automatically disabled March 16, 2024 14:42

Head branch was pushed to by a user without write access

@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 16, 2024
@lunny lunny merged commit ed02d1f into go-gitea:main Mar 17, 2024
26 checks passed
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 17, 2024
… namespaced (go-gitea#26986)

Fix go-gitea#20175

Current implementation of API does not allow creating pull requests
between branches of the same
repo when you specify *namespace* (owner of the repo) in `head` field in
http request body.

--- 

Although GitHub implementation of API allows performing such action and
since Gitea targeting
compatibility with GitHub API I see it as an appropriate change.

I'm proposing a fix to the described problem and test case which covers
this logic.

My use-case just in case:
go-gitea#20175 (comment)
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Mar 17, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 17, 2024
* giteaofficial/main:
  Fix PR creation via api between branches of same repo with head field namespaced (go-gitea#26986)
  Remove fomantic message module (go-gitea#29856)
  fix double border and border-radius on empty action steps (go-gitea#29845)
  add `.suppressed` link class (go-gitea#29847)
silverwind pushed a commit to silverwind/gitea that referenced this pull request Mar 17, 2024
… namespaced (go-gitea#26986)

Fix go-gitea#20175

Current implementation of API does not allow creating pull requests
between branches of the same
repo when you specify *namespace* (owner of the repo) in `head` field in
http request body.

--- 

Although GitHub implementation of API allows performing such action and
since Gitea targeting
compatibility with GitHub API I see it as an appropriate change.

I'm proposing a fix to the described problem and test case which covers
this logic.

My use-case just in case:
go-gitea#20175 (comment)
lunny added a commit that referenced this pull request Mar 20, 2024
… namespaced (#26986) (#29857)

Backport #26986 by @norohind

Fix #20175

Current implementation of API does not allow creating pull requests
between branches of the same
repo when you specify *namespace* (owner of the repo) in `head` field in
http request body.

---------

Co-authored-by: norohind <60548839+norohind@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
8 participants