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 Add/Remove WIP on pull request title failure #29999

Merged
merged 6 commits into from
Mar 25, 2024
Merged

Fix Add/Remove WIP on pull request title failure #29999

merged 6 commits into from
Mar 25, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Mar 22, 2024 •
edited
Loading

Fix #29997

pr.HeadCommitID cannot be used directly, it needs to be loaded after pr is loaded from the database.

@lunny lunny added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Mar 22, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 22, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 22, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 22, 2024
@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 Mar 22, 2024
wxiaoguang
wxiaoguang previously approved these changes Mar 22, 2024
View reviewed changes
@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 22, 2024
@lunny lunny mentioned this pull request Mar 22, 2024
Closed
@Gr3q
Copy link

Gr3q commented Mar 22, 2024

Workaround with the API, replace everything in curly brackets.

curl -X 'PATCH' \
  'https://{host}/api/v1/repos/{user}/{repo}/issues/{pr_index}' \
  -H 'accept: application/json' \
  -H 'authorization: {your auth}' \
  -H 'Content-Type: application/json' \
  -d '{
  "title": "{title}"
}'

@silverwind
Copy link
Member

@lunny please fix tests.

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 25, 2024
@wxiaoguang wxiaoguang dismissed their stale review March 25, 2024 02:28

Dismiss approval. Unclear underlying problem.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Mar 25, 2024
@wolfogre wolfogre mentioned this pull request Mar 25, 2024
Merged
lunny pushed a commit that referenced this pull request Mar 25, 2024
@wolfogre
Fix misuse of TxContext (#30061)
c6c4d66 
Help #29999, or its tests cannot pass.

Also, add some comments to clarify the usage of `TxContext`.

I don't check all usages of `TxContext` because there are too many
(almost 140+). It's a better idea to replace them with `WithTx` instead
of checking them one by one. However, that may be another refactoring
PR.
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 25, 2024
@wolfogre @GiteaBot
Fix misuse of TxContext (go-gitea#30061)
7230746 
Help go-gitea#29999, or its tests cannot pass.

Also, add some comments to clarify the usage of `TxContext`.

I don't check all usages of `TxContext` because there are too many
(almost 140+). It's a better idea to replace them with `WithTx` instead
of checking them one by one. However, that may be another refactoring
PR.
@GiteaBot GiteaBot mentioned this pull request Mar 25, 2024
Merged
wolfogre added a commit that referenced this pull request Mar 25, 2024
@GiteaBot @wolfogre
Fix misuse of TxContext (#30061) (#30062)
78795dd 
Backport #30061 by @wolfogre

Help #29999, or its tests cannot pass.

Also, add some comments to clarify the usage of `TxContext`.

I don't check all usages of `TxContext` because there are too many
(almost 140+). It's a better idea to replace them with `WithTx` instead
of checking them one by one. However, that may be another refactoring
PR.

Co-authored-by: Jason Song <i@wolfogre.com>
@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 25, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 25, 2024
@lunny lunny merged commit 475b6e8 into go-gitea:main Mar 25, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 25, 2024
@lunny lunny deleted the lunny/fix_rm_wip branch March 25, 2024 07:51
@GiteaBot
Copy link
Contributor

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

go run ./contrib/backport 29999
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Mar 25, 2024
lunny added a commit to lunny/gitea that referenced this pull request Mar 25, 2024
@lunny
Fix Add/Remove WIP on pull request title failure (go-gitea#29999)
099fdef 
Fix go-gitea#29997
@lunny lunny mentioned this pull request Mar 25, 2024
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Mar 25, 2024
KN4CK3R pushed a commit that referenced this pull request Mar 25, 2024
@lunny
Fix Add/Remove WIP on pull request title failure (#29999) (#30066)
087aed7 
Fix #29997
Backport #29999
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 25, 2024
@silverwind
Merge remote-tracking branch 'origin/main' into cmpzero
eed565f 
* origin/main:
  Remove fomantic table module (go-gitea#30047)
  Fix menu buttons in issues and release (go-gitea#30056)
  Fix git grep search limit, add test (go-gitea#30071)
  Fix button hover border (go-gitea#30048)
  Fix Add/Remove WIP on pull request title failure (go-gitea#29999)
  Fix misuse of `TxContext` (go-gitea#30061)
  Remove jQuery `.attr` from the reaction selector (go-gitea#30052)
  Remove jQuery `.attr` from the ComboMarkdownEditor (go-gitea#30051)
  Remove jQuery `.attr` from the label edit exclusive checkbox (go-gitea#30053)
  Remove jQuery `.attr` from the repository topic bar (go-gitea#30050)
  Use db.ListOptions directly instead of Paginator interface to make it easier to use and fix performance of /pulls and /issues (go-gitea#29990)
  Migrate `gt-hidden` to `tw-hidden` (go-gitea#30046)
  Forbid jQuery `is` and fix issues (go-gitea#30016)
  Remove fomantic segment module (go-gitea#30042)
  Migrate margin and padding helpers to tailwind (go-gitea#30043)
@lunny lunny modified the milestones: 1.23.0, 1.22.0 Mar 26, 2024
TKaxv-7S added a commit to TKaxv-7S/gitea that referenced this pull request Apr 10, 2024
@TKaxv-7S
Merge tag 'refs/tags/v1.21.10' into release/v1.21-tk
37da8c7 
v1.21.10
* BUGFIXES
  * Fix Add/Remove WIP on pull request title failure (go-gitea#29999) (go-gitea#30066)
  * Fix misuse of `TxContext` (go-gitea#30061) (go-gitea#30062)
  * Respect DEFAULT_ORG_MEMBER_VISIBLE setting when adding creator to org (go-gitea#30013) (go-gitea#30035)
  * Escape paths for find file correctly (go-gitea#30026) (go-gitea#30031)
  * Remove duplicate option in admin screen and now-unused translation keys (go-gitea#28492) (go-gitea#30024)
  * Fix manual merge form and 404 page templates (go-gitea#30000)

# gpg: Signature made Tue, Mar 26, 2024  7:48:36 AM
# gpg:                using EDDSA key 8722B61D72341082553B201CB8BE6D610E61C862
# gpg: Can't check signature: No public key
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wolfogre wolfogre wolfogre approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! 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/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Can't remove WIP from PR title
6 participants
@lunny @Gr3q @silverwind @GiteaBot @wxiaoguang @wolfogre