Beyond coding. We forge. (Code of Conduct: https://codeberg.org/forgejo/code-of-conduct)
Find a file
Lunny Xiao 7e81775184
Move database operations of merging a pull request to post receive hook and add a transaction (#30805)
Merging PR may fail because of various problems. The pull request may
have a dirty state because there is no transaction when merging a pull
request. ref
https://github.com/go-gitea/gitea/pull/25741#issuecomment-2074126393

This PR moves all database update operations to post-receive handler for
merging a pull request and having a database transaction. That means if
database operations fail, then the git merging will fail, the git client
will get a fail result.

There are already many tests for pull request merging, so we don't need
to add a new one.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit ebf0c969403d91ed80745ff5bd7dfbdb08174fc7)

Conflicts:
	modules/private/hook.go
	routers/private/hook_post_receive.go
	trivial conflicts because
	  263a716cb5 * Performance optimization for git push (#30104)
	was not cherry-picked and because of
	  998a431747 Do not update PRs based on events that happened before they existed
(cherry picked from commit eb792d9f8a)

(cherry picked from commit ec3f5f9992d7ff8250c044a4467524d53bd50210)
2024-05-14 15:37:32 +02:00
.devcontainer Switch to the maintained vitest extension (#29914) 2024-03-26 19:04:25 +01:00
.forgejo fix(release): add missing ARG RELEASE_VERSION 2024-04-17 16:06:43 +00:00
.gitea pull_request_template: test/needed label 2024-03-22 10:11:47 +01:00
assets [CHORE] Cleanup dependency 2024-03-30 00:01:42 +01:00
build s/Gitea/Forgejo in various log messages and comments 2024-04-22 14:41:17 +00:00
cmd Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-14 15:37:32 +02:00
contrib Merge branch 'rebase-forgejo-dependency' into wip-forgejo 2024-02-05 18:58:23 +01:00
custom/conf Fixup app.example.ini for task section, which is now queue.task (#30555) 2024-04-21 18:14:45 +02:00
docker [BRANDING] cosmetic s/Gitea/Forgejo/ in logs, messages, etc. 2024-02-05 16:02:14 +01:00
models Get repo list with OrderBy alpha should respect owner too (#30784) (#30875) 2024-05-14 15:27:25 +02:00
modules Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-14 15:37:32 +02:00
options Merge pull request '[v7.0/forgejo] Translation updates from Weblate' (#3749) from bp-v7.0/forgejo-61643a6 into v7.0/forgejo 2024-05-14 12:20:19 +00:00
public [FEAT] sourcehut webhooks 2024-04-05 19:36:04 +00:00
release-notes/8.0.0 Rename Str2html to SanitizeHTML and clarify its behavior (followup) (take 2) 2024-05-13 18:38:48 +00:00
releases/images [DOCS] RELEASE-NOTES.md 2024-02-05 14:44:32 +01:00
routers Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-14 15:37:32 +02:00
services Move database operations of merging a pull request to post receive hook and add a transaction (#30805) 2024-05-14 15:37:32 +02:00
templates Merge pull request '[v7.0/forgejo] Expand code diffs against the commits repo' (#3767) from bp-v7.0/forgejo-220c3fe into v7.0/forgejo 2024-05-14 12:42:18 +00:00
tests Expand code diffs against the commits repo 2024-05-14 12:06:44 +00:00
tools Add svg linter and fix incorrect svgs (#30086) 2024-03-30 07:17:30 +01:00
web_src Have time.js use UTC-related getters/setters (#30857) (#30869) 2024-05-14 15:25:52 +02:00
.air.toml Exclude routers/private/tests from air (#29949) 2024-03-26 19:04:26 +01:00
.changelog.yml Adapt .changelog.yml to new labeling system (#27701) 2023-10-20 00:22:00 +02:00
.deadcode-out [DEADCODE] update 2024-04-21 18:44:11 +02:00
.dockerignore Adjust VS Code debug filename match in .gitignore (#30158) 2024-03-30 07:17:32 +01:00
.editorconfig [v7.0/forgejo] Improve translatability of "Transfer ownership" (#3750) 2024-05-14 12:14:36 +00:00
.eslintrc.yaml Forbid jQuery .attr (#30116) 2024-03-30 07:17:31 +01:00
.gitattributes [META] Use correct language for .tmpl 2024-02-05 14:44:33 +01:00
.gitignore move some scripts from 'build' to 'tools' directory, misc refactors (#29844) 2024-03-26 19:04:25 +01:00
.gitmodules cleanup(tests): remove manual testing submodule 2024-04-21 08:46:56 +00:00
.gitpod.yml Switch to the maintained vitest extension (#29914) 2024-03-26 19:04:25 +01:00
.golangci.yml [GITEA] depguard sha256-simd 2024-02-05 16:54:44 +01:00
.ignore Add /public/assets to .ignore (#26232) 2023-07-30 12:34:20 +02:00
.markdownlint.yaml Update JS dependencies (#28537) 2023-12-30 05:29:03 +00:00
.npmrc Upgrade to npm lockfile v3 and explicitely set it (#23561) 2023-03-18 19:38:10 +01:00
.spectral.yaml Add spectral linter for Swagger (#20321) 2022-07-11 18:07:16 -05:00
.stylelintrc.yaml Enable a few stylelint rules (#30038) 2024-03-26 19:04:28 +01:00
.yamllint.yaml fully replace drone with actions (#27556) 2023-10-11 06:39:32 +00:00
BSDmakefile Fix build errors on BSD (in BSDMakefile) (#27594) 2023-10-13 15:38:27 +00:00
build.go User/Org Feed render description as per web (#23887) 2023-04-04 04:39:47 +01:00
CODEOWNERS [META] Add CODEOWNERS files 2024-02-05 14:44:33 +01:00
CONTRIBUTING.md docs: contributing: avoid information duplication (#3454) 2024-04-25 19:13:36 +00:00
DCO Remove address from DCO (#22595) 2023-01-24 18:52:38 +00:00
Dockerfile fix(release): add missing ARG RELEASE_VERSION 2024-04-17 16:06:43 +00:00
Dockerfile.rootless feat(release): add OCI labels to container images 2024-04-17 05:48:38 +00:00
go.mod fix(security): CVE-2024-24788 malformed DNS message 2024-05-08 14:47:59 +00:00
go.sum Update module gitea.com/go-chi/binding to v0.0.0-20240430071103-39a851e106ed 2024-05-07 08:35:25 +01:00
LICENSE [DOCS] LICENSE: add Forgejo Authors 2024-02-05 14:44:32 +01:00
main.go [RELEASE] decouple the release name from the version number 2024-02-17 15:27:35 +01:00
MAINTAINERS Apply to become a maintainer (#27522) 2023-10-08 10:36:40 -04:00
Makefile Upgrade github.com/editorconfig-checker/editorconfig-checker to v2.8.0 2024-05-02 17:38:26 +01:00
package-lock.json [v7.0/forgejo] Go and JS dependencies 2024-04-02 12:27:01 +02:00
package.json [v7.0/forgejo] Go and JS dependencies 2024-04-02 12:27:01 +02:00
playwright.config.js Enforce trailing comma in JS on multiline (#30002) 2024-03-26 19:04:27 +01:00
poetry.lock Update JS any PY dependencies, remove workarounds (#30085) 2024-03-30 07:17:30 +01:00
poetry.toml Clean up pyproject.toml and package.json, fix poetry options (#25327) 2023-06-18 18:13:08 +00:00
pyproject.toml Update js and py dependencies, bump python (#29561) 2024-03-06 12:10:46 +08:00
README.md [BRANDING] add Forgejo logo 2024-02-05 16:02:13 +01:00
RELEASE-NOTES.md [skip ci] docs(release-notes): 7.0.2 2024-05-01 15:05:28 +02:00
renovate.json Reduce concurrent Renovate PR's 2024-03-26 09:40:48 +01:00
tailwind.config.js Migrate font-family to tailwind (#30118) 2024-03-30 07:17:32 +01:00
updates.config.js Configure pinned JS dependencies via updates.config.js (#29696) 2024-03-20 08:46:28 +01:00
vitest.config.js Switch to happy-dom for testing (#29948) 2024-03-26 19:04:26 +01:00
webpack.config.js Update JS any PY dependencies, remove workarounds (#30085) 2024-03-30 07:17:30 +01:00

Welcome to Forgejo

Hi there! Tired of big platforms playing monopoly? Providing Git hosting for your project, friends, company or community? Forgejo (/for'd͡ʒe.jo/ inspired by forĝejo the Esperanto word for forge) has you covered with its intuitive interface, light and easy hosting and a lot of builtin functionality.

Forgejo was created in 2022 because we think that the project should be owned by an independent community. If you second that, then Forgejo is for you! Our promise: Independent Free/Libre Software forever!

What does Forgejo offer?

If you like any of the following, Forgejo is literally meant for you:

  • Lightweight: Forgejo can easily be hosted on nearly every machine. Running on a Raspberry? Small cloud instance? No problem!
  • Project management: Besides Git hosting, Forgejo offers issues, pull requests, wikis, kanban boards and much more to coordinate with your team.
  • Publishing: Have something to share? Use releases to host your software for download, or use the package registry to publish it for docker, npm and many other package managers.
  • Customizable: Want to change your look? Change some settings? There are many config switches to make Forgejo work exactly like you want.
  • Powerful: Organizations & team permissions, CI integration, Code Search, LDAP, OAuth and much more. If you have advanced needs, Forgejo has you covered.
  • Privacy: From update checker to default settings: Forgejo is built to be privacy first for you and your crew.
  • Federation: (WIP) We are actively working to connect software forges with each other through ActivityPub, and create a collaborative network of personal instances.

Learn more

Dive into the documentation, subscribe to releases and blog post on our website, find us on the Fediverse or hop into our Matrix room if you have any questions or want to get involved.

Get involved

If you are interested in making Forgejo better, either by reporting a bug or by changing the governance, please take a look at the contribution guide.