Beyond coding. We forge. (Code of Conduct: https://codeberg.org/forgejo/code-of-conduct)
Go to file
Max Wipfli 4ddd9af50f
Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211)
This PR introduces the `ReviewedOn` and `ReviewedBy` variables for the
default merge message templates (e.g.,
`.gitea/default_merge_message/MERGE_TEMPLATE.md`).

This allows customizing the default merge messages while retaining these
trailers.

This also moves the associated logic out of `pull.tmpl` into the
relevant Go function.

This is a first contribution towards #11077.

---

For illustration, this allows to recreate the "default default" merge
message with the following template:
```
.gitea/default_merge_message/MERGE_TEMPLATE.md
Merge pull request '${PullRequestTitle}' (${PullRequestReference}) from ${HeadBranch} into ${BaseBranch}

${ReviewedOn}
${ReviewedBy}
```

(cherry picked from commit da4bbc42477ba04d175cc0775a0c5ec90c4c24fe)

Conflicts:
	docs/content/usage/merge-message-templates.en-us.md
	not in Forgejo
	templates/repo/issue/view_content/pull.tmpl
	trivial context conflict
2024-06-09 16:04:57 +02:00
.devcontainer Remove sqlite-viewer and using database client (#31223) 2024-06-09 11:13:39 +02:00
.forgejo Update ghcr.io/visualon/renovate Docker tag to v37.392.0 2024-06-06 00:04:28 +00:00
.gitea [CHORE] Remove Microsoft SQL Server Support 2024-04-05 23:37:36 +02:00
assets Replace reply with a forked version to fix the cut-off of the incoming mail text (#3747) 2024-05-13 21:24:58 +00:00
build s/Gitea/Forgejo in various log messages and comments 2024-04-21 21:26:15 +05:00
cmd fix(cli): add missing quote in storage help 2024-05-25 00:32:36 +02:00
contrib Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00:00
custom/conf Add MAX_ROWS option for CSV rendering (#30268) 2024-06-09 16:04:57 +02:00
docker fix(Dockerfile.rootless): revert to default path for app.ini 2024-04-26 21:30:10 +02:00
models Merge pull request 'test(oauth): RFC 6749 Section 10.2 conformance' (#4032) from earl-warren/forgejo:wip-oauth-public into forgejo 2024-06-06 10:00:37 +00:00
modules Add MAX_ROWS option for CSV rendering (#30268) 2024-06-09 16:04:57 +02:00
options [skip ci] Updated licenses and gitignores 2024-06-09 11:13:39 +02:00
public [FEAT] sourcehut webhooks 2024-04-05 10:20:40 +02:00
release-notes Add slogan config (#3752) 2024-06-07 17:12:48 +00:00
releases/images [DOCS] RELEASE-NOTES.md 2024-02-05 14:44:32 +01:00
routers Fix NuGet Package API for $filter with Id equality (#31188) 2024-06-09 11:13:39 +02:00
services Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-09 16:04:57 +02:00
templates Allow including Reviewed-on/Reviewed-by lines for custom merge messages (#31211) 2024-06-09 16:04:57 +02:00
tests Add lint-go-gopls (#30729) 2024-06-09 11:13:39 +02:00
tools Add lint-go-gopls (#30729) 2024-06-09 11:13:39 +02:00
web_src Remove .segment from .project-column (#31204) 2024-06-09 11:13:39 +02:00
.air.toml Kill all gitea processes before air build (#30477) 2024-04-21 11:38:58 +02:00
.deadcode-out chore(deadcode): restore the previous format 2024-06-08 22:04:04 +02:00
.dockerignore Add /public/assets/img/webpack to ignore files again (#30451) 2024-04-15 20:01:36 +02:00
.editorconfig fixed indentation style in editorconfig for go.mod 2024-05-14 00:24:18 +02:00
.eslintrc.yaml add built js files to eslint ignore (#30737) 2024-05-05 08:22:50 +01:00
.gitattributes Add interface{} to any replacement to make fmt, exclude *.pb.go (#30461) 2024-04-15 20:01:36 +02:00
.gitignore Add /public/assets/img/webpack to ignore files again (#30451) 2024-04-15 20:01:36 +02:00
.gitmodules cleanup(tests): remove manual testing submodule 2024-04-21 10:13:51 +02:00
.gitpod.yml Remove sqlite-viewer and using database client (#31223) 2024-06-09 11:13:39 +02:00
.golangci.yml Clean up revive linter config, tweak golangci output (#30980) 2024-05-19 13:57:52 +02:00
.ignore Add /options/license and /options/gitignore to .ignore (#30219) 2024-04-07 15:40:31 +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
.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 I feel responsible … (Codeowners) 2024-04-27 02:22:05 +02:00
CONTRIBUTING.md docs: contributing: avoid information duplication (#3454) 2024-04-25 19:10:43 +00:00
DCO Remove address from DCO (#22595) 2023-01-24 18:52:38 +00:00
Dockerfile feat(release): upgrade to golang:1.22-alpine3.20 2024-06-04 23:50:47 +02:00
Dockerfile.rootless feat(release): upgrade to golang:1.22-alpine3.20 2024-06-04 23:50:47 +02:00
flake.lock Add nix flake for dev shell (#30967) 2024-05-26 20:08:07 +02:00
flake.nix Add nix flake for dev shell (#30967) 2024-05-26 20:08:07 +02:00
go.mod Merge pull request 'Update module github.com/huandu/xstrings to v1.5.0' (#4050) from renovate/github.com-huandu-xstrings-1.x into forgejo 2024-06-07 16:48:16 +00:00
go.sum Merge pull request 'Update module github.com/huandu/xstrings to v1.5.0' (#4050) from renovate/github.com-huandu-xstrings-1.x into forgejo 2024-06-07 16:48:16 +00: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
Makefile Add lint-go-gopls (#30729) 2024-06-09 11:13:39 +02:00
package-lock.json Update dependency tailwindcss to v3.4.4 2024-06-06 00:04:49 +00:00
package.json Update dependency tailwindcss to v3.4.4 2024-06-06 00:04:49 +00:00
playwright.config.js Enforce trailing comma in JS on multiline (#30002) 2024-03-26 19:04:27 +01:00
poetry.lock Update dependency codespell to v2.3.0 2024-05-25 02:07:08 +00:00
poetry.toml Clean up pyproject.toml and package.json, fix poetry options (#25327) 2023-06-18 18:13:08 +00:00
pyproject.toml Add codespell support and fix a good number of typos with its help (#3270) 2024-05-09 13:49:37 +00: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.3 (take 2) 2024-05-22 16:48:19 +02:00
renovate.json chore(dependency): add the dependency-upgrade label to PRs 2024-06-08 11:00:50 +02:00
stylelint.config.js Merge pull request 'Port "Enable declaration-block-no-redundant-longhand-properties (#30950)' (#3769) from beowulf/gitea-port-pull-30950 into forgejo 2024-05-14 22:23:54 +00:00
tailwind.config.js Move custom tw- helpers to tailwind plugin (#31184) 2024-06-09 11:13:39 +02:00
vitest.config.js Switch to happy-dom for testing (#29948) 2024-03-26 19:04:26 +01:00
webpack.config.js replace jquery-minicolors with coloris (#30055) 2024-04-07 11:02:33 +02: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.