This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.
Go to file
6543 c95d9603ea
Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)
* Only check for conflicts/merging if the PR has not been merged in the interim (#10132)

* Only check for merging if the PR has not been merged in the interim

* fixup! Only check for merging if the PR has not been merged in the interim

* Try to fix test failure

* Use PR2 not PR1 in tests as PR1 merges automatically

* return already merged error

* enforce locking

* move pullrequest checking to after merge

This might improve the chance that the race does not affect us but does not prevent it.

* Remove minor race with getting merge commit id

move check pr after merge

* Remove unnecessary prepareTestEnv - onGiteaRun does this for us

* Add information about when merging occuring

* More logging

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>

* re order

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
2020-02-10 13:09:08 +00:00
.github Display Github support button (#7343) 2019-07-02 12:06:25 +02:00
assets
cmd Fix push-create SSH bugs (#10145) (#10151) 2020-02-05 15:50:06 +01:00
contrib Resolve deprecated INI conversion (#9525) 2019-12-27 22:37:26 -05:00
custom/conf Make CertFile and KeyFile relative to CustomPath (#9868) (#9874) 2020-01-19 19:59:30 +00:00
docker Fix latest docker image haven't include static files. (#9252) 2019-12-05 12:18:28 -05:00
docs Changelog 1.11.0 (#10204) 2020-02-10 13:34:30 +02:00
integrations Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 2020-02-10 13:09:08 +00:00
models Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 2020-02-10 13:09:08 +00:00
modules Prevent double waitgroup decrement (#10170) (#10175) 2020-02-07 17:12:49 +00:00
options Add option to prevent LDAP from deactivating everything on empty search (#9879) (#9896) 2020-01-20 21:18:23 +02:00
public remove google font call (#9668) (#9681) 2020-01-09 16:40:57 -05:00
routers Fix followers and following tabs in profile (#10202) (#10203) 2020-02-09 21:00:24 +00:00
scripts
services Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) 2020-02-10 13:09:08 +00:00
snap Remove explicit 'generate' calls, fix release task (#9288) 2019-12-08 18:56:59 +02:00
templates Fix followers and following tabs in profile (#10202) (#10203) 2020-02-09 21:00:24 +00:00
vendor update gitea.com/macaron/macaron to 1.4.0 (#9608) 2020-01-05 15:27:25 +01:00
web_src Fix code-expansion arc-green theme bug (#10180) (#10185) 2020-02-08 00:04:03 +01:00
.changelog.yml Changelog 1.11.0 (#10204) 2020-02-10 13:34:30 +02:00
.drone.yml Fix regression with tag test running (#9941) 2020-01-22 15:49:08 -05:00
.editorconfig Ensure LF on checkouts and in editors (#9259) 2019-12-05 23:09:01 +02:00
.eslintignore move semantic.dropdown.custom.js to webpack (#9064) 2019-11-21 18:30:14 -05:00
.eslintrc move semantic.dropdown.custom.js to webpack (#9064) 2019-11-21 18:30:14 -05:00
.gitattributes Ensure LF on checkouts and in editors (#9259) 2019-12-05 23:09:01 +02:00
.gitignore Stop various tests from adding to the source tree (#9515) 2019-12-28 10:08:05 +08:00
.golangci.yml Add API for Issue set Subscription (#8729) 2019-11-02 23:27:49 +08:00
.ignore Add .ignore file for search tools (#9417) 2019-12-19 00:34:23 +01:00
.lgtm
.npmrc add 'npm' and 'npm-update' make targets and lockfile (#7246) 2019-06-18 22:59:47 -04:00
.revive.toml
.stylelintrc replace lesshint with stylelint (#7305) 2019-06-27 08:36:36 +02:00
BSDmakefile
CHANGELOG.md Changelog 1.11.0 (#10204) 2020-02-10 13:34:30 +02:00
CONTRIBUTING.md [Docs] Add guide on howto develop API (#9587) 2020-01-04 10:23:40 +08:00
DCO
Dockerfile alpine 3.11 (#9440) 2019-12-26 19:52:32 -05:00
go.mod update gitea.com/macaron/macaron to 1.4.0 (#9608) 2020-01-05 15:27:25 +01:00
go.sum update gitea.com/macaron/macaron to 1.4.0 (#9608) 2020-01-05 15:27:25 +01:00
LICENSE
main.go Add golangci (#6418) 2019-06-12 15:41:28 -04:00
MAINTAINERS Update Owners for upcoming year (#9290) 2019-12-07 21:51:55 -05:00
Makefile [Backport] CI optimisation & add github token env var (#9875) 2020-01-19 23:21:54 +01:00
package-lock.json Update JS dependencies (#9255) 2019-12-06 14:41:25 +08:00
package.json Update JS dependencies (#9255) 2019-12-06 14:41:25 +08:00
README.md Remove explicit 'generate' calls, fix release task (#9288) 2019-12-08 18:56:59 +02:00
README_ZH.md README: Update Screenshots and Badges in ZH (#8813) 2019-11-04 19:12:58 -05:00
tools.go Use vendored go-swagger (#8087) 2019-09-04 22:53:54 +03:00
webpack.config.js fix webpack polyfills (#9735) (#9738) 2020-01-12 17:43:16 -05:00

简体中文

logo Gitea - Git with a cup of tea

Build Status Join the Discord chat at https://discord.gg/NsatcWJ codecov Go Report Card GoDoc GitHub release Help Contribute to Open Source Become a backer/sponsor of gitea License: MIT Crowdin

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

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!

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 forum!

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