Beyond coding. We forge. https://forgejo.org
  • Go 81.7%
  • go-html-template 10.3%
  • TypeScript 2.8%
  • JavaScript 2%
  • CSS 1.8%
  • Other 1.3%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
vednoc 6840f006da feat(ui): improve merge CLI instructions (#14900)
With #14831 merged, we can fearlessly copy-paste CLI instructions.

This change converts CLI instructions to code blocks and adds copy
buttons, bringing them up on par with other code blocks.  It builds on
top of #14579 and fixes a regression (from that PR) which breaks #14038.

Rather than making the template ugly in areas that are sensitive to
whitespace, I opted for extending the copy button to trim all empty
lines and append new lines to the ones with content.  Besides, the
entirety of merge functionality requires JS, so this way is better.

Additionally, I also updated the UI and made it more consistent by
reusing existing markup styles with minimal amount of changes.

| Before                                                      | After                                                       |
|-------------------------------------------------------------|-------------------------------------------------------------|
| ![image](/attachments/5af8fabf-331b-456f-85cf-f8952b9e8500) | ![image](/attachments/55cc15b1-3e6c-4dde-a4ef-74b2324473ac) |
| ![image](/attachments/f9ed2a7f-486a-4a09-acc9-9ece6270eb73) | ![image](/attachments/f1b02fd3-89af-4508-befc-5bea806ef86b) |

Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/14900
Reviewed-by: 0ko <0ko@noreply.codeberg.org>
2026-11-22 04:47:13 +01:00
.devcontainer Update golang packages to v1.27 (forgejo) (#14457) 2026-09-27 19:10:21 +02:00
.forgejo fix(ci): actually run the e2e tests affected by a PR as intended (#15319) 2026-11-21 19:35:16 +01:00
.semgrep 2026-11-18 security patches (#15297) 2026-11-18 06:15:49 +01:00
assets packages(debian): use pault.ag/go/debian/deb to parse .deb files (#15242) 2026-11-17 02:31:07 +01:00
build feat: improve space-efficiency of emoji data (#14413) 2026-09-19 09:54:48 +02:00
cmd feat: show git config after AGit pull request creation (#14497) 2026-11-07 16:55:41 +01:00
contrib feat: always use UNIX sockets for internal communication (#14148) 2026-10-02 22:42:18 +02:00
custom/conf chore!: remove deprecated update checker HTTP endpoint (#15216) 2026-11-10 15:38:59 +01:00
docker fix: remove default 'REVERSE_PROXY_TRUSTED_PROXIES = *' from docker config (#12782) 2026-05-28 13:52:03 +02:00
models fix: display Forgejo Actions user in activity feed, not Ghost (#15357) 2026-11-22 02:40:50 +01:00
modules feat: Enable JXL Support (#15180) 2026-11-19 12:50:22 +01:00
options feat: Add Release Notification in the UI (#13512) 2026-11-17 15:02:17 +01:00
public Add special webhook type for integration with git-pages (#14966) 2026-11-01 16:46:01 +01:00
release-notes chore: fix typo in release notes for security fix !15298 (#15330) 2026-11-19 11:33:09 +01:00
release-notes-published chore: fix typo in release notes for security fix !15298 (#15330) 2026-11-19 11:33:09 +01:00
releases/images fix: optimize PNG images losslessly (#14270) 2026-09-13 03:01:06 +02:00
routers fix: API pagination in /repos/{owner}/{repo}/pulls/{index}/reviews (#15354) 2026-11-21 12:47:44 +01:00
services fix: API pagination in /repos/{owner}/{repo}/pulls/{index}/reviews (#15354) 2026-11-21 12:47:44 +01:00
templates feat(ui): improve merge CLI instructions (#14900) 2026-11-22 04:47:13 +01:00
tests feat(ui): improve merge CLI instructions (#14900) 2026-11-22 04:47:13 +01:00
tools chore: migrate svg component to Typescript (#14666) 2026-10-05 16:27:52 +02:00
web_src feat(ui): improve merge CLI instructions (#14900) 2026-11-22 04:47:13 +01:00
.air.toml chore: rename 'migrations' to 'gitea_migrations' 2025-10-14 14:40:49 -06:00
.deadcode-out feat: Support Git LFS image diffs (#14662) 2026-11-07 16:43:20 +01:00
.dockerignore fix(dev): update gitignore e2e for new branding (#14251) 2026-09-05 22:22:24 +02:00
.editorconfig i18n(next): convert indention style to tabs: en, editorconfig (#10661) 2026-01-02 05:56:48 +01:00
.envrc.example docs: added a shebang to the example envrc (#14041) 2026-08-23 18:25:56 +02:00
.gitattributes refactor: migrate lazy webcomponents to Typescript (#14720) 2026-10-17 23:09:06 +02:00
.gitignore fix(dev): update gitignore e2e for new branding (#14251) 2026-09-05 22:22:24 +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 Update module github.com/golangci/golangci-lint/v2/cmd/golangci-lint to v2.13.2 (forgejo) (#14155) 2026-09-25 21:45:49 +02:00
.ignore Add /options/license and /options/gitignore to .ignore (#30219) 2024-04-07 15:40:31 +02:00
.mailmap Add .mailmap with aliases for Unknwon (github.com/Unknwon) 2024-08-14 08:26:16 -04:00
.markdownlint.yaml Update JS dependencies (#28537) 2023-12-30 05:29:03 +00:00
.mockery.yml feat: add support in Forgejo's update checker for LTS and multiple releases (#14278) 2026-09-16 02:09:58 +02:00
.node-version [skip ci] Update Node.js to v24.21.0 (forgejo) (#14453) 2026-09-19 22:13:56 +02:00
.npmrc Upgrade to npm lockfile v3 and explicitely set it (#23561) 2023-03-18 19:38:10 +01:00
.release-notes-assistant.yaml chore(release): v11 is EoL (on 2026-07-16) [skip ci] (#13195) 2026-07-15 21:00:04 +02:00
.spectral.yaml Add spectral linter for Swagger (#20321) 2022-07-11 18:07:16 -05:00
.yamllint.yaml fully replace drone with actions (#27556) 2023-10-11 06:39:32 +00:00
BSDmakefile feat: Makefile & BSDmakefile changes (#7455) 2025-04-27 10:04:32 +00:00
CODEOWNERS chore: remove 0ko from codeowners (#15206) 2026-11-09 20:08:32 +01:00
CONTRIBUTING.md chore: fix some links, resolve redirects to categorized documentation (#13702) 2026-08-06 23:57:11 +02:00
DCO Remove address from DCO (#22595) 2023-01-24 18:52:38 +00:00
Dockerfile feat: always use UNIX sockets for internal communication (#14148) 2026-10-02 22:42:18 +02:00
Dockerfile.rootless feat: always use UNIX sockets for internal communication (#14148) 2026-10-02 22:42:18 +02:00
eslint.config.ts chore: mark window config properties readonly (#14976) 2026-10-24 12:06:38 +02:00
flake.lock chore: update flake.lock; add gnupg as dependency (#12497) 2026-05-09 23:53:35 +02:00
flake.nix chore: change formatter nixfmt-rfc-style -> nixfmt (#14040) 2026-08-23 15:20:05 +02:00
go.mod packages(debian): use pault.ag/go/debian/deb to parse .deb files (#15242) 2026-11-17 02:31:07 +01:00
go.sum packages(debian): use pault.ag/go/debian/deb to parse .deb files (#15242) 2026-11-17 02:31:07 +01:00
LICENSE Forgejo v9.0 is GPLv3+ 2024-08-22 09:09:29 +02:00
main.go fix: do not mix urfave v2 with urfave v3 (#8168) 2025-06-12 15:38:03 +02:00
Makefile Update module github.com/golangci/golangci-lint/v2/cmd/golangci-lint to v2.15.0 (forgejo) (#15012) 2026-10-25 10:32:21 +01:00
manifest.scm chore: add delve Go debugger to Guix manifest (#12662) 2026-05-22 11:09:11 +02:00
package-lock.json chore(deps): update Mermaid (#15168) 2026-11-08 04:01:36 +01:00
package.json chore(deps): update Mermaid (#15168) 2026-11-08 04:01:36 +01:00
playwright.config.ts refactor: migrate JS configs to Typescript (#14564) 2026-10-05 03:02:47 +02:00
README.md chore: fix a few typos in the documentation (#9134) 2025-09-04 01:53:40 +02:00
release-notes-assistant.sh fix(rna): prioritize breaking changes without a feature or bug label over non-breaking changes (#12124) 2026-04-17 15:24:58 +02:00
RELEASE-NOTES.md chore(release-notes): fix release notes of chroma update in v8.0.0 2025-10-05 17:10:38 +05:00
shell.nix chore: update flake.lock; add gnupg as dependency (#12497) 2026-05-09 23:53:35 +02:00
stylelint.config.ts refactor: migrate JS configs to Typescript (#14564) 2026-10-05 03:02:47 +02:00
tailwind.config.ts chore: migrate toast module to Typescript (#14890) 2026-10-18 20:14:06 +02:00
tsconfig.json chore: migrate emoji component to Typescript (#14538) 2026-10-04 22:39:43 +02:00
vitest.config.ts refactor: migrate relative-time component to Typescript (#14508) 2026-09-27 05:53:42 +02:00
webpack.config.ts chore(deps): update Mermaid (#15168) 2026-11-08 04:01:36 +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 built-in 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.

License

Forgejo is distributed under the terms of the GPL version 3.0 or any later version.

The agreement for this license was documented in June 2023 and implemented during the development of Forgejo v9.0. All Forgejo versions before v9.0 are distributed under the MIT license.

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.