1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-30 13:13:10 +00:00
Find a file
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543)
* Make auto check manual merge as a chooseable mod and add manual merge way on ui

as title, Before this pr, we use same way with GH to check manually merge.
It good, but in some special cases, misjudgments can occur. and it's hard
to fix this bug. So I add option to allow repo manager block "auto check manual merge"
function, Then it will have same style like gitlab(allow empty pr). and to compensate for
not being able to detect THE PR merge automatically, I added a manual approach.

Signed-off-by: a1012112796 <1012112796@qq.com>

* make swager

* api support

* ping ci

* fix TestPullCreate_EmptyChangesWithCommits

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* Apply review suggestions and add test

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* fix build

* test error message

* make fmt

* Fix indentation issues identified by @silverwind

Co-authored-by: silverwind <me@silverwind.io>

* Fix tests and make manually merged disabled error on API the same

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

* a small nit

* fix wrong commit id error

* fix bug

* simple test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2021-03-03 22:41:23 -05:00
.github Issue template addition: Are you using Gitea behind CloudFlare? (#14098) 2021-02-18 12:28:07 +01:00
assets Clean up SVG (#13680) 2020-12-17 16:33:53 -05:00
build Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
cmd Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
contrib Add environment-to-ini to docker image (#14762) 2021-02-23 20:21:44 +01:00
custom/conf Allow blocking some email domains from registering an account (#14667) 2021-02-15 00:31:29 +01:00
docker Add environment-to-ini to docker image (#14762) 2021-02-23 20:21:44 +01:00
docs go1.16 (#14783) 2021-02-28 18:08:33 -05:00
integrations Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
models Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
modules Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
options Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
public use gogs.ico to create a better svg for migration page (#14795) 2021-02-25 14:13:44 +08:00
routers Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
services Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
snap Consolidate Logos and update README header (#14136) 2021-01-01 14:04:35 -05:00
templates Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
tools Added 2 fuzzers (#13818) 2020-12-10 20:43:11 +01:00
vendor Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
web_src Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
.air.conf Add 'watch-backend' (#12330) 2020-07-27 14:05:42 -04:00
.changelog.yml Add API Section to Changelog (#13125) 2020-10-13 01:39:17 -04:00
.drone.yml drone workspace path 2021-02-28 23:57:58 -05:00
.editorconfig Fix .editorconfig (#13735) 2020-11-28 20:29:46 +02:00
.eslintrc Update JS dependencies and webpack (#14118) 2020-12-27 15:24:27 +01:00
.gitattributes Update JS dependencies and misc tweaks (#13741) 2020-11-29 16:39:36 -05:00
.gitignore Generate man pages (#13901) 2021-02-24 16:36:48 -06:00
.golangci.yml Move macaron to chi (#14293) 2021-01-26 16:36:53 +01:00
.ignore Fonts rework (#12114) 2020-07-06 11:56:54 +03:00
.lgtm refactor: ignore LGTM from author of pull request. (#3283) 2018-01-02 06:13:49 -06:00
.npmrc Update JS dependencies and misc tweaks (#13741) 2020-11-29 16:39:36 -05:00
.revive.toml refactor: replace lint to revive (#5422) 2018-12-03 09:28:46 -05:00
.stylelintrc Fix tooltips and issue dependency styles (#13458) 2020-11-10 20:28:07 +02:00
BSDmakefile Add BSDmakefile to prevent errors when make is called under FreeBSD (#4446) 2018-07-16 20:45:51 +02:00
build.go update revive lint to latest commit (#12921) 2020-09-22 20:02:16 +03:00
CHANGELOG.md Changelog v1.13.2 (#14535) (#14543) 2021-02-02 02:19:10 +01:00
CONTRIBUTING.md Update owners for 2021 (#14206) 2021-01-01 01:41:03 +02:00
DCO follow the advisor: add DCO and some improvements 2016-11-04 16:43:41 +08:00
Dockerfile go1.16 (#14783) 2021-02-28 18:08:33 -05:00
Dockerfile.rootless go1.16 (#14783) 2021-02-28 18:08:33 -05:00
go.mod Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
go.sum Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
LICENSE Fix typo 2016-11-08 08:42:05 +01:00
main.go Dump github/gitlab/gitea repository data to a local directory and restore to gitea (#12244) 2020-12-27 11:34:19 +08:00
MAINTAINERS Remove self from MAINTAINERS (#14286) 2021-01-09 01:53:19 -05:00
Makefile use gomod support w/ xgo (#14836) 2021-03-01 11:43:55 +08:00
package-lock.json Bump gsap from 3.5.1 to 3.6.0 (#14410) 2021-01-22 02:21:45 -05:00
package.json Upgrade 'css-minimizer-webpack-plugin' to the latest version (#14527) 2021-01-30 19:07:23 +01:00
README.md Update Link 2021-01-13 10:55:52 -05:00
README_ZH.md Kd/add bountysource (#14323) 2021-01-13 10:53:17 -05:00
SECURITY.md Add security policy to repo (#12536) 2020-08-19 17:15:55 +01:00
semantic.json Update JS dependencies (#12782) 2020-09-10 12:16:40 +08:00
webpack.config.js Update JS dependencies and webpack (#14118) 2020-12-27 15:24:27 +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.13 or greater.
  • make frontend which requires Node.js 10.13 or greater.

If pre-built frontend files are present it is possible to only build the backend:

TAGS="bindata" make backend

Parallelism is not supported for these targets, so please don't include -j <num>.

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