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

Make backend code respond correct JSON when creating PR #25353

Merged
merged 5 commits into from
Jun 19, 2023
Merged

Make backend code respond correct JSON when creating PR #25353

merged 5 commits into from
Jun 19, 2023

Conversation

wxiaoguang
Copy link
Contributor

Fix #25351

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 18, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 18, 2023
@wxiaoguang wxiaoguang mentioned this pull request Jun 18, 2023
Closed
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Jun 18, 2023
@wxiaoguang wxiaoguang added this to the 1.21.0 milestone Jun 18, 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 Jun 18, 2023
@silverwind
Copy link
Member

Has some test failures.

@lunny
Copy link
Member

lunny commented Jun 19, 2023

Looks like there is no frontend changes?

@wxiaoguang
Copy link
Contributor Author

Has some test failures.

Fixed the tests

Looks like there is no frontend changes?

Frontend has changed ahead.

@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 Jun 19, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 19, 2023
@lunny lunny enabled auto-merge (squash) June 19, 2023 04:52
@wxiaoguang
Copy link
Contributor Author

Auto merge doesn't work due to " docker-dryrun Expected — Waiting for status to be reported "

@silverwind
Copy link
Member

Auto merge doesn't work due to " docker-dryrun Expected — Waiting for status to be reported "

Strange, as per #25329 (comment), the check should have been removed.

auto-merge was automatically disabled June 19, 2023 07:46

Base branch was modified

@lunny lunny enabled auto-merge (squash) June 19, 2023 07:47
@lunny lunny merged commit b4e4b7a into go-gitea:main Jun 19, 2023
23 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 19, 2023
@wxiaoguang wxiaoguang deleted the fix-new-pr branch June 19, 2023 08:39
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jun 19, 2023
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
4078981 
* giteaofficial/main:
  Fix incorrect actions ref_name (go-gitea#25358)
  Make backend code respond correct JSON when creating PR (go-gitea#25353)
  Fix loading state regression in markup content (go-gitea#25349)
  Batch delete issue and improve tippy opts (go-gitea#25253)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 17, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@silverwind silverwind silverwind 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

Network Error when creating pull request
4 participants
@wxiaoguang @silverwind @lunny @GiteaBot