WIP: This PR is only used to see the git diff better #1

Draft

tom wants to merge 4 commits from tn-fix-branch-deletion into forgejo

pull from: tn-fix-branch-deletion

merge into: tom:forgejo

tom:forgejo

tom:tn-make-new-temp-release

tom:v9.0/forgejo

tom:v7.0/forgejo

tom:v8.0/forgejo

tom:v1.21/forgejo

tom:v1.20/forgejo

tom:v1.19/forgejo

tom:v1.18/forgejo

tom:v1.17/forgejo

Conversation 0 Commits 4 Files changed 14 +376 -275

tom commented 2024-10-23 21:49:34 +02:00

Owner

Copy link

Checklist

The contributor guide contains information that will be helpful to first time contributors. There also are a few conditions for merging Pull Requests in Forgejo repositories. You are also welcome to join the Forgejo development chatroom.

Tests

• I added test coverage for Go changes...
  • in their respective *_test.go for unit tests.
  • in the tests/integration directory if it involves interactions with a live Forgejo server.
• I added test coverage for JavaScript changes...
  • in web_src/js/*.test.js if it can be unit tested.
  • in tests/e2e/*.test.e2e.js if it requires interactions with a live Forgejo server (see also the developer guide for JavaScript testing).

Documentation

• I created a pull request to the documentation to explain to Forgejo users how to use this change.
• I did not document these changes and I do not expect someone else to do it.

Release notes

• I do not want this change to show in the release notes.
• I want the title to show in the release notes with a link to this pull request.
• I want the content of the release-notes/<pull request number>.md to be be used for the release notes instead of the title.

## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [ ] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title.

tom added 3 commits 2024-10-23 21:49:35 +02:00

create "internal/shared" package to workaround import loop issues 968a1a7029

Add branch auto deletion for scheduled PRs 526cf1cb12

Add woodpecker ci (temp) f2a3d10588

tom force-pushed tn-fix-branch-deletion from f2a3d10588 to d21dff4883 2024-10-24 17:44:07 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from d21dff4883 to 61ebc7c17e 2024-10-24 21:06:06 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from 61ebc7c17e to 006c1000c2 2024-10-25 21:14:31 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from 006c1000c2 to acea726ff3 2024-10-25 21:19:59 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from acea726ff3 to 6a7085a7fe 2024-10-25 21:28:27 +02:00 Compare

tom added 1 commit 2024-10-26 19:11:12 +02:00

debug branches 4ab43fd3db

tom force-pushed tn-fix-branch-deletion from 4ab43fd3db to 36274c8223 2024-10-26 21:00:49 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from 36274c8223 to 8981e11426 2024-10-26 21:59:13 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from 8981e11426 to 2eb1a45392 2024-10-26 22:00:40 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from 2eb1a45392 to 67abe24ca5 2024-10-26 22:13:24 +02:00 Compare

tom force-pushed tn-fix-branch-deletion from 67abe24ca5 to 9a366d607f 2024-10-27 01:01:25 +02:00 Compare

tom added 1 commit 2024-10-27 01:56:11 +02:00

lol 308c74b402

tom force-pushed tn-fix-branch-deletion from 308c74b402 to 207d1b4b7a 2024-10-27 02:04:30 +01:00 Compare

tom force-pushed tn-fix-branch-deletion from 207d1b4b7a to f62aae159f 2024-10-27 02:09:47 +01:00 Compare

tom added 1 commit 2024-10-27 23:51:31 +01:00

test normal integration test 7b2c5c19cd

tom force-pushed tn-fix-branch-deletion from 7b2c5c19cd to 9ea8aaab1b 2024-10-28 00:42:59 +01:00 Compare

tom added 1 commit 2024-10-28 00:44:26 +01:00

lol 20acb1df2f

tom force-pushed tn-fix-branch-deletion from 20acb1df2f to fe3bec00bc 2024-10-28 02:43:29 +01:00 Compare

tom force-pushed tn-fix-branch-deletion from fe3bec00bc to c943dab099 2024-10-28 03:24:55 +01:00 Compare

tom force-pushed tn-fix-branch-deletion from c943dab099 to 93ec0f8ee8 2024-10-28 03:56:45 +01:00 Compare

tom force-pushed tn-fix-branch-deletion from 93ec0f8ee8 to af89efcd0f 2024-10-28 06:23:19 +01:00 Compare

tom force-pushed tn-fix-branch-deletion from af89efcd0f to 7635150699 2024-10-28 06:55:25 +01:00 Compare

tom added 1 commit 2024-10-28 07:09:03 +01:00

Add woodpecker ci (temp) 3b47057ffa

All checks were successful

Hide all checks

ci/woodpecker/pr/build Pipeline was successful

Details

testing / backend-checks (pull_request) Successful in 5m29s

Details

testing / frontend-checks (pull_request) Successful in 1m26s

Details

/ release-notes (pull_request_target) Has been skipped

Details

ci/woodpecker/push/build Pipeline was successful

Details

testing / test-unit (pull_request) Successful in 7m26s

Details

testing / test-e2e (pull_request) Successful in 2m47s

Details

testing / test-mysql (pull_request) Successful in 31m57s

Details

testing / test-pgsql (pull_request) Successful in 38m25s

Details

testing / test-sqlite (pull_request) Successful in 32m14s

Details

testing / test-remote-cacher (map[image:docker.io/bitnami/redis:7.2 port:6379]) (pull_request) Successful in 2m26s

Details

testing / test-remote-cacher (map[image:docker.io/bitnami/valkey:7.2 port:6379]) (pull_request) Successful in 2m23s

Details

testing / test-remote-cacher (map[image:ghcr.io/microsoft/garnet-alpine:1.0.14 port:6379]) (pull_request) Successful in 2m32s

Details

testing / test-remote-cacher (map[image:registry.redict.io/redict:7.3.0-scratch port:6379]) (pull_request) Successful in 2m36s

Details

testing / security-check (pull_request) Successful in 1m5s

Details

This pull request has changes conflicting with the target branch.

• models/forgejo_migrations/migrate.go
• services/shared/automerge/automerge.go
• tests/integration/pull_merge_test.go

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin tn-fix-branch-deletion:tn-fix-branch-deletion

git checkout tn-fix-branch-deletion

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout forgejo

git merge --no-ff tn-fix-branch-deletion

git checkout tn-fix-branch-deletion

git rebase forgejo

git checkout forgejo

git merge --ff-only tn-fix-branch-deletion

git checkout tn-fix-branch-deletion

git rebase forgejo

git checkout forgejo

git merge --no-ff tn-fix-branch-deletion

git checkout forgejo

git merge --squash tn-fix-branch-deletion

git checkout forgejo

git merge --ff-only tn-fix-branch-deletion

git checkout forgejo

git merge tn-fix-branch-deletion

git push origin forgejo

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: tom/forkjo#1

No description provided.