MokoConsulting/MokoGitea-Fork
1
0
Fork 0
Code Issues 136 Pull Requests Releases 96 Wiki Activity
12,495 Commits 48 Branches 347 Tags
f1e85622da0492fa01d8449eb938197cd4fa65bf
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
zeripath f1e85622da Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 
The current TestPatch conflict code uses a plain git apply which does not properly
account for 3-way merging. However, we can improve things using `git read-tree -m` to
do a three-way merge then follow the algorithm used in merge-one-file. We can also use 
`--patience` and/or `--histogram` to generate a nicer diff for applying patches too.

Fix #13679
Fix #6417

Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-12-19 05:19:25 +01:00
.gitea
Issue template form (#16349)
2021-09-15 20:33:13 +03:00
.github
hide note message for pull request template (#17529)
2021-11-02 22:43:16 -05:00
assets
Clean up SVG (#13680)
2020-12-17 16:33:53 -05:00
build
Update JS dependencies, adjust eslint config (#17904)
2021-12-04 14:43:14 +08:00
cmd
Fix outType on gitea dump (#18000)
2021-12-17 13:38:45 +00:00
contrib
Use fmt.Sprintf correctly (#17886)
2021-12-02 20:36:50 +01:00
custom/conf
Make AvatarRenderedSizeFactor configurable and set it to 3 (#17951)
2021-12-16 10:18:38 +08:00
docker
Use shadowing script for docker (#17846)
2021-12-01 18:08:27 +00:00
docs
Add option to define refs in issue templates (#17842)
2021-12-17 21:29:09 +00:00
integrations
Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991)
2021-12-16 19:01:14 +00:00
models
Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991)
2021-12-16 19:01:14 +00:00
modules
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)
2021-12-19 05:19:25 +01:00
options
[skip ci] Updated licenses and gitignores
2021-12-19 00:29:01 +00:00
public
Add migrate from Codebase (#16768)
2021-12-02 23:24:02 +01:00
routers
Support open compare page directly (#17975)
2021-12-17 22:20:27 +00:00
services
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)
2021-12-19 05:19:25 +01:00
snap
Removable media support (#16136)
2021-06-11 14:51:05 -04:00
templates
Change <a> elements to underline on hover (#17898)
2021-12-18 05:29:00 +00:00
tools
Add bundle download for repository (#14538)
2021-08-24 11:47:09 -05:00
vendor
Update chi/middleware to chi/v5/middleware (#17888)
2021-12-02 21:58:08 +01:00
web_src
Change <a> elements to underline on hover (#17898)
2021-12-18 05:29:00 +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
update xgo to use 1.17 (#17915)
2021-12-05 19:48:38 -05:00
.editorconfig
add well-known config for OIDC (#15355)
2021-04-15 22:32:00 -04:00
.eslintrc
Update JS dependencies, adjust eslint config (#17904)
2021-12-04 14:43:14 +08:00
.gitattributes
Set correct language for Dockerfile variants (#17999)
2021-12-16 04:52:01 -05:00
.gitignore
Frontend refactor: move Vue related code from index.js to components dir, and remove unused codes. (#17301)
2021-10-15 10:35:26 +08:00
.golangci.yml
Remove unnecessary variable assignments (#17695)
2021-11-18 09:33:06 +08: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
Stop packaging node_modules in release tarballs (#15273)
2021-04-09 01:08:14 -04:00
.revive.toml
Avoid double imports (#17569)
2021-11-08 09:04:13 +02: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
Changelog for v1.15.7 (#17871) (#17889)
2021-12-02 20:49:59 -05:00
CONTRIBUTING.md
[API] generalize list header (#16551)
2021-08-12 14:43:08 +02:00
DCO
follow the advisor: add DCO and some improvements
2016-11-04 16:43:41 +08:00
Dockerfile
Use shadowing script for docker (#17846)
2021-12-01 18:08:27 +00:00
Dockerfile.rootless
Use shadowing script for docker (#17846)
2021-12-01 18:08:27 +00:00
go.mod
Update chi/middleware to chi/v5/middleware (#17888)
2021-12-02 21:58:08 +01:00
go.sum
Update chi/middleware to chi/v5/middleware (#17888)
2021-12-02 21:58:08 +01:00
jest.config.js
Add copy button to markdown code blocks (#17638)
2021-11-16 16:16:05 +08: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 me from the maintainers (#17599)
2021-11-09 22:40:16 +08:00
Makefile
Add new JS linter rules (#17699)
2021-11-22 16:19:01 +08:00
package-lock.json
Bump swagger-ui-dist from 4.1.2 to 4.1.3 (#17965)
2021-12-12 22:57:35 -05:00
package.json
Bump swagger-ui-dist from 4.1.2 to 4.1.3 (#17965)
2021-12-12 22:57:35 -05:00
README_ZH.md
Fix report card link (#16885)
2021-08-31 01:06:30 +02:00
README.md
Refactor repo-legacy.js, remove messy global variables. Fix errors. (#17646)
2021-11-19 00:45:00 +08:00
SECURITY.md
Add security policy to repo (#12536)
2020-08-19 17:15:55 +01:00
webpack.config.js
Update JS dependencies (#17357)
2021-10-19 15:23:58 +08:00
Readme License Contributing Security Changelog

SECURITY.md

Reporting security issues

The Gitea maintainers take security seriously.
If you discover a security issue, please bring it to their attention right away!

Reporting a Vulnerability

Please DO NOT file a public issue, instead send your report privately to security@gitea.io.

Security reports are greatly appreciated and we will publicly thank you for it, although we keep your name confidential if you request it.

Reference in New Issue View Git Blame Copy Permalink
S
Description
MokoGitea — custom Gitea fork with .mokogitea manifests, custom fields, org priorities, folder-based wikis, and Joomla update server generation
https://mokoconsulting.tech/support/mokogitea
bitbucketcicddevopsdocker-registry-v2gitgit-guigit-lfsgit-servergiteagithubgithub-actionsgitlabgogolanghacktoberfestmaven-servernpm-registryself-hostedtypescriptvue
Readme MIT
1,020 MiB
Releases 96
MokoGitea (VERSION: 06.21.00)
Latest
2026-06-21 00:21:51 +00:00
Languages
Go 78.3%
Handlebars 12.8%
TypeScript 4.2%
CSS 1.9%
JavaScript 1.5%
Other 1.2%