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 orphan check for deleted branch #27310

Merged
merged 3 commits into from
Sep 28, 2023
Merged

fix orphan check for deleted branch #27310

merged 3 commits into from
Sep 28, 2023

Conversation

earl-warren
Copy link
Contributor

@earl-warren earl-warren commented Sep 27, 2023 •
edited
Loading

(cherry picked from commit c1d888686fe445e4edecb9d835c5b3893b574b75)

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 27, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 27, 2023
@Gusted @earl-warren
fix orphan check for deleted branch
2e51f28 
- Modify the deleted branch orphan check to check for the new table instead.
- Regression from 6e19484
- Resolves https://codeberg.org/forgejo/forgejo/issues/1522

(cherry picked from commit c1d888686fe445e4edecb9d835c5b3893b574b75)
@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 27, 2023
@lunny lunny added the type/bug label Sep 27, 2023
@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 Sep 27, 2023
@lunny lunny added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. backport/v1.20 This PR should be backported to Gitea 1.20 backport/v1.21 This PR should be backported to Gitea 1.21 labels Sep 28, 2023
@lunny lunny enabled auto-merge (squash) September 28, 2023 01:30
@lunny lunny merged commit 98f0220 into go-gitea:main Sep 28, 2023
26 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Sep 28, 2023
@GiteaBot GiteaBot mentioned this pull request Sep 28, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 28, 2023
@earl-warren @Gusted @GiteaBot
fix orphan check for deleted branch (go-gitea#27310)
6840c33 
- Modify the deleted branch orphan check to check for the new table
instead.
- Regression from 6e19484
- Resolves https://codeberg.org/forgejo/forgejo/issues/1522

(cherry picked from commit c1d888686fe445e4edecb9d835c5b3893b574b75)

Co-authored-by: Gusted <postmaster@gusted.xyz>
@GiteaBot GiteaBot mentioned this pull request Sep 28, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Sep 28, 2023
@earl-warren @Gusted @GiteaBot
fix orphan check for deleted branch (go-gitea#27310)
62361b5 
- Modify the deleted branch orphan check to check for the new table
instead.
- Regression from 6e19484
- Resolves https://codeberg.org/forgejo/forgejo/issues/1522

(cherry picked from commit c1d888686fe445e4edecb9d835c5b3893b574b75)

Co-authored-by: Gusted <postmaster@gusted.xyz>
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 28, 2023
lunny pushed a commit that referenced this pull request Sep 28, 2023
@GiteaBot @earl-warren @Gusted
fix orphan check for deleted branch (#27310) (#27321)
1a923c9 
Backport #27310 by @earl-warren

- Modify the deleted branch orphan check to check for the new table
instead.
- Regression from 6e19484
- Resolves https://codeberg.org/forgejo/forgejo/issues/1522

(cherry picked from commit c1d888686fe445e4edecb9d835c5b3893b574b75)

Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
Co-authored-by: Gusted <postmaster@gusted.xyz>
@GiteaBot
Copy link
Contributor

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

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Sep 28, 2023
lunny pushed a commit that referenced this pull request Sep 28, 2023
@GiteaBot @earl-warren @Gusted
fix orphan check for deleted branch (#27310) (#27320)
2138661 
Backport #27310 by @earl-warren

- Modify the deleted branch orphan check to check for the new table
instead.
- Regression from 6e19484
- Resolves https://codeberg.org/forgejo/forgejo/issues/1522

(cherry picked from commit c1d888686fe445e4edecb9d835c5b3893b574b75)

Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
Co-authored-by: Gusted <postmaster@gusted.xyz>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 28, 2023
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
7bf3179 
* giteaoffical/main: (22 commits)
  Fix review UI (go-gitea#27322)
  Improve issue history dialog and make poster can delete their own history (go-gitea#27323)
  Improve branch list UI (go-gitea#27319)
  doctor: delete action entries without existing user (go-gitea#27292)
  fix orphan check for deleted branch (go-gitea#27310)
  make writing main test easier (go-gitea#27270)
  [skip ci] Updated translations via Crowdin
  Fix protected branch icon location (go-gitea#26576)
  move the `gitea admin` subcommands into separate files (go-gitea#27307)
  Fix chinese translation (go-gitea#27296)
  bump bleve (go-gitea#27300)
  Redefine the meaning of column is_active to make Actions Registration Token generation easier (go-gitea#27143)
  Use vitest globals (go-gitea#27102)
  Fix divider in subscription page (go-gitea#27298)
  Fix yaml test (go-gitea#27297)
  Enable production source maps for index.js, fix CSS sourcemaps (go-gitea#27291)
  Fix some animation bugs (go-gitea#27287)
  Add missed return to actions view fetch (go-gitea#27289)
  Fix more yaml lint errors (go-gitea#27284)
  Fix incorrect change from go-gitea#27231 (go-gitea#27275)
  ...
nrdufour added a commit to nrdufour/home-ops that referenced this pull request Oct 4, 2023
@nrdufour
chore(deps): update docker.io/gitea/gitea docker tag to v1.20.5 (#129)
f9b6839 
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.20.4` -> `1.20.5` |

---

### ⚠ Dependency Lookup Warnings ⚠

Warnings were logged while processing this repo. Please check the logs for more information.

---

### Release Notes

<details>
<summary>go-gitea/gitea (docker.io/gitea/gitea)</summary>

### [`v1.20.5`](https://github.com/go-gitea/gitea/blob/HEAD/CHANGELOG.md#1205---2023-10-03)

[Compare Source](go-gitea/gitea@v1.20.4...v1.20.5)

-   ENHANCEMENTS
    -   Fix z-index on markdown completion ([#&#8203;27237](go-gitea/gitea#27237)) ([#&#8203;27242](go-gitea/gitea#27242) & [#&#8203;27238](go-gitea/gitea#27238))
    -   Use secure cookie for HTTPS sites ([#&#8203;26999](go-gitea/gitea#26999)) ([#&#8203;27013](go-gitea/gitea#27013))
-   BUGFIXES
    -   Fix git 2.11 error when checking IsEmpty ([#&#8203;27393](go-gitea/gitea#27393)) ([#&#8203;27396](go-gitea/gitea#27396))
    -   Allow get release download files and lfs files with oauth2 token format ([#&#8203;26430](go-gitea/gitea#26430)) ([#&#8203;27378](go-gitea/gitea#27378))
    -   Fix orphan check for deleted branch ([#&#8203;27310](go-gitea/gitea#27310)) ([#&#8203;27320](go-gitea/gitea#27320))
    -   Quote table `release` in sql queries ([#&#8203;27205](go-gitea/gitea#27205)) ([#&#8203;27219](go-gitea/gitea#27219))
    -   Fix release URL in webhooks ([#&#8203;27182](go-gitea/gitea#27182)) ([#&#8203;27184](go-gitea/gitea#27184))
    -   Fix successful return value for `SyncAndGetUserSpecificDiff` ([#&#8203;27152](go-gitea/gitea#27152)) ([#&#8203;27156](go-gitea/gitea#27156))
    -   fix pagination for followers and following ([#&#8203;27127](go-gitea/gitea#27127)) ([#&#8203;27138](go-gitea/gitea#27138))
    -   Fix issue templates when blank isses are disabled ([#&#8203;27061](go-gitea/gitea#27061)) ([#&#8203;27082](go-gitea/gitea#27082))
    -   Fix context cache bug & enable context cache for dashabord commits' authors([#&#8203;26991](go-gitea/gitea#26991)) ([#&#8203;27017](go-gitea/gitea#27017))
    -   Fix INI parsing for value with trailing slash ([#&#8203;26995](go-gitea/gitea#26995)) ([#&#8203;27001](go-gitea/gitea#27001))
    -   Fix PushEvent NullPointerException jenkinsci/github-plugin ([#&#8203;27203](go-gitea/gitea#27203)) ([#&#8203;27249](go-gitea/gitea#27249))
    -   Fix organization field being null in POST /orgs/{orgid}/teams ([#&#8203;27150](go-gitea/gitea#27150)) ([#&#8203;27167](go-gitea/gitea#27167) & [#&#8203;27162](go-gitea/gitea#27162))
    -   Fix bug of review request number ([#&#8203;27406](go-gitea/gitea#27406)) ([#&#8203;27104](go-gitea/gitea#27104))
-   TESTING
    -   services/wiki: Close() after error handling ([#&#8203;27129](go-gitea/gitea#27129)) ([#&#8203;27137](go-gitea/gitea#27137))
-   DOCS
    -   Improve actions docs related to `pull_request` event ([#&#8203;27126](go-gitea/gitea#27126)) ([#&#8203;27145](go-gitea/gitea#27145))
-   MISC
    -   Add logs for data broken of comment review ([#&#8203;27326](go-gitea/gitea#27326)) ([#&#8203;27344](go-gitea/gitea#27344))
    -   Load reviewer before sending notification ([#&#8203;27063](go-gitea/gitea#27063)) ([#&#8203;27064](go-gitea/gitea#27064))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zLjIiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zLjIiLCJ0YXJnZXRCcmFuY2giOiJtYWluIn0=-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/129
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
@lunny lunny added backport/done All backports for this PR have been created and removed backport/v1.20 This PR should be backported to Gitea 1.20 labels Oct 24, 2023
lunny added a commit to lunny/gitea that referenced this pull request Oct 24, 2023
@lunny
Revert "fix orphan check for deleted branch (go-gitea#27310) (go-gite…
ee96c73 
…a#27320)"

This reverts commit 2138661.
lunny added a commit that referenced this pull request Oct 24, 2023
@lunny
Revert "fix orphan check for deleted branch (#27310) (#27320)" (#27763)
a1c232c 
Because branch table is created until 1.21
Fix #27508
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 27, 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

@delvh delvh delvh approved these changes

@puni9869 puni9869 puni9869 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
6 participants
@earl-warren @GiteaBot @lunny @delvh @puni9869 @Gusted