No description
Find a file
zeripath 92e81e97e8
Detect conflicts with 3way merge (#18536)
* Detect conflicts with 3way merge

Unforunately git apply --3way reports conflicts differently than standard patches
resulting in conflicts being missed.

Adjust the conflict detection code to account for this different error reporting.

Fix #18514

Signed-off-by: Andrew Thornton <art27@cantab.net>

* and three-way failed

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
2022-02-02 12:46:10 +08:00
.gitea Issue template form (#16349) 2021-09-15 20:33:13 +03:00
.github Fix documents for development and bug report (#18249) 2022-01-13 10:58:46 +08:00
assets Clean up SVG (#13680) 2020-12-17 16:33:53 -05:00
build format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
cmd Validate migration files (#18203) 2022-01-26 10:45:51 +01:00
contrib Update to work with latest VS Code go debugger (#18397) 2022-01-25 05:00:55 +00:00
custom/conf Switch to non-deprecation setting (#18358) 2022-01-23 20:02:29 +01:00
docker In docker rootless use $GITEA_APP_INI if provided (#18524) 2022-02-01 20:18:57 +00:00
docs Frontport changelog 1.16.0 (#18468) (#18470) 2022-01-30 19:22:16 +01:00
integrations Attempt to prevent intermittent failure TestGit/xxx/BranchProtectMerge/MergePR (#18451) 2022-01-29 15:35:36 +00:00
models Add GetUserTeams (#18499) 2022-02-01 14:09:24 -05:00
modules Add GetUserTeams (#18499) 2022-02-01 14:09:24 -05:00
options [skip ci] Updated translations via Crowdin 2022-02-02 00:16:04 +00:00
public Add packagist webhook (#18224) 2022-01-23 21:46:30 +08:00
routers Add GetUserTeams (#18499) 2022-02-01 14:09:24 -05:00
services Detect conflicts with 3way merge (#18536) 2022-02-02 12:46:10 +08:00
snap revert to node14 for snapcraft 2022-02-01 15:10:55 -05:00
templates Fix review excerpt (#18502) 2022-02-01 19:08:33 +00:00
tools format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
web_src Fix review excerpt (#18502) 2022-02-01 19:08:33 +00:00
.air.toml Exclude from watching tests (#17744) 2021-11-22 05:17:21 -05:00
.changelog.yml Changelog for v1.15.0-rc1 (#16422) 2021-07-15 11:47:57 -04:00
.drone.yml point to s3 endpoint directly (#18497) 2022-01-31 17:39:39 -05:00
.editorconfig add well-known config for OIDC (#15355) 2021-04-15 22:32:00 -04:00
.eslintrc Use explicit jQuery import, remove unused eslint globals (#18435) 2022-01-28 21:00:11 +00:00
.gitattributes Add js vendor directory to .gitattributes (#18350) 2022-01-21 23:42:38 +08:00
.gitignore Validate migration files (#18203) 2022-01-26 10:45:51 +01:00
.golangci.yml format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
.ignore Add some .ignore entries (#18296) 2022-01-16 17:26:15 +00:00
.lgtm
.npmrc Stop packaging node_modules in release tarballs (#15273) 2021-04-09 01:08:14 -04:00
.stylelintrc Update JS dependencies (#17611) 2021-11-11 09:52:16 +08:00
BSDmakefile Add BSDmakefile to prevent errors when make is called under FreeBSD (#4446) 2018-07-16 20:45:51 +02:00
build.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
CHANGELOG.md Update 1.16.0 changelog to set #17846 as breaking (#18533) 2022-02-01 17:09:32 -05:00
CONTRIBUTING.md Add a few more comments to the CONTRIBUTING.md document (#18469) 2022-01-30 19:56:48 +01:00
DCO
Dockerfile Upgrade Alpine from 3.13 to 3.15 (#18050) 2022-01-19 16:55:17 -05:00
Dockerfile.rootless Upgrade Alpine from 3.13 to 3.15 (#18050) 2022-01-19 16:55:17 -05:00
go.mod Update Goldmark to Goldmark 1.4.4 (#18420) 2022-01-29 21:17:21 +08:00
go.sum Update Goldmark to Goldmark 1.4.4 (#18420) 2022-01-29 21:17:21 +08:00
jest.config.js Add copy button to markdown code blocks (#17638) 2021-11-16 16:16:05 +08:00
LICENSE
main.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
MAINTAINERS Add singuliere to MAINTAINERS (#18148) 2022-01-02 02:12:13 +01:00
Makefile add gitea-fmt back (#18526) 2022-02-01 12:43:09 -05:00
package-lock.json Update JS dependencies, fix lint (#18389) 2022-02-01 13:21:08 -05:00
package.json Update JS dependencies, fix lint (#18389) 2022-02-01 13:21:08 -05:00
README.md Update TODOs badge to reflect new default branch (#18182) 2022-01-04 10:46:32 -06:00
README_ZH.md Update TODOs badge to reflect new default branch (#18182) 2022-01-04 10:46:32 -06:00
SECURITY.md Add security policy to repo (#12536) 2020-08-19 17:15:55 +01:00
webpack.config.js Support webauthn (#17957) 2022-01-14 16:03:31 +01:00

Gitea

Gitea - Git with a cup of tea

View the chinese version of this document

Purpose

The goal of this project is to make the easiest, fastest, and most painless way of setting up a self-hosted Git service. Using Go, this can be done with an independent binary distribution across all platforms which Go supports, including Linux, macOS, and Windows on x86, amd64, ARM and PowerPC architectures. Want to try it before doing anything else? Do it with the online demo! This project has been forked from Gogs since 2016.11 but changed a lot.

Building

From the root of the source tree, run:

TAGS="bindata" make build

or if SQLite support is required:

TAGS="bindata sqlite sqlite_unlock_notify" make build

The build target is split into two sub-targets:

  • make backend which requires Go 1.16 or greater.
  • make frontend which requires Node.js LTS or greater and Internet connectivity to download npm dependencies.

When building from the official source tarballs which include pre-built frontend files, the frontend target will not be triggered, making it possible to build without Node.js and Internet connectivity.

Parallelism (make -j <num>) is not supported.

More info: https://docs.gitea.io/en-us/install-from-source/

Using

./gitea web

NOTE: If you're interested in using our APIs, we have experimental support with documentation.

Contributing

Expected workflow is: Fork -> Patch -> Push -> Pull Request

NOTES:

  1. YOU MUST READ THE CONTRIBUTORS GUIDE BEFORE STARTING TO WORK ON A PULL REQUEST.
  2. If you have found a vulnerability in the project, please write privately to security@gitea.io. Thanks!

Translating

Translations are done through Crowdin. If you want to translate to a new language ask one of the managers in the Crowdin project to add a new language there.

You can also just create an issue for adding a language or ask on discord on the #translation channel. If you need context or find some translation issues, you can leave a comment on the string or ask on Discord. For general translation questions there is a section in the docs. Currently a bit empty but we hope fo fill it as questions pop up.

https://docs.gitea.io/en-us/translation-guidelines/

Crowdin

Further information

For more information and instructions about how to install Gitea, please look at our documentation. If you have questions that are not covered by the documentation, you can get in contact with us on our Discord server or create a post in the discourse forum.

We maintain a list of Gitea-related projects at gitea/awesome-gitea.
The hugo-based documentation theme is hosted at gitea/theme.
The official Gitea CLI is developed at gitea/tea.

Authors

Backers

Thank you to all our backers! 🙏 [Become a backer]

Sponsors

Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [Become a sponsor]

FAQ

How do you pronounce Gitea?

Gitea is pronounced /ɡɪti:/ as in "gi-tea" with a hard g.

Why is this not hosted on a Gitea instance?

We're working on it.

License

This project is licensed under the MIT License. See the LICENSE file for the full license text.

Screenshots

Looking for an overview of the interface? Check it out!

Dashboard User Profile Global Issues
Branches Web Editor Activity
New Migration Migrating Pull Request View
Pull Request Dark Diff Review Dark Diff Dark