gitea/modules
Dan Čermák b8c9a0c323
Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (#34770)
The merge-upstream route was so far performing any kind of merge, even
those that would create merge commits and thus make your branch diverge
from upstream, requiring manual intervention via the git cli to undo the
damage.

With the new optional parameter ff_only, we can instruct gitea to error
out, if a non-fast-forward merge would be performed.
2025-06-19 12:29:10 -07:00
..
actions Fix remaining issues after gopls modernize formatting (#34771) 2025-06-18 11:37:49 -07:00
activitypub Enable tenv and testifylint rules (#32852) 2024-12-15 10:41:29 +00:00
analyze Refactor older tests to use testify (#33140) 2025-01-09 09:21:47 +08:00
assetfs Refactor embedded assets and drop unnecessary dependencies (#34692) 2025-06-12 03:59:33 +00:00
auth Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
avatar Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
badge Add flat-square action badge style (#34062) 2025-04-01 09:42:10 +00:00
base Add material icons for file list (#33837) 2025-03-10 15:57:17 +08:00
cache Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
cachegroup Cache GPG keys, emails and users when list commits (#34086) 2025-04-09 16:34:38 +00:00
charset Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
commitstatus Keeping consistent between UI and API about combined commit status state and fix some bugs (#34562) 2025-06-09 04:05:33 +00:00
container Refactor sidebar assignee&milestone&project selectors (#32465) 2024-11-11 04:07:54 +08:00
csv Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
dump Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
emoji Refactor older tests to use testify (#33140) 2025-01-09 09:21:47 +08:00
eventsource Refactor older tests to use testify (#33140) 2025-01-09 09:21:47 +08:00
fileicon support the open-icon of folder (#34168) 2025-04-28 19:51:32 -07:00
generate Refactor JWT secret generating & decoding code (#29172) 2024-02-16 15:18:30 +00:00
git Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
gitrepo Refactor Branch struct in package modules/git (#33980) 2025-04-02 17:31:32 +00:00
globallock Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
graceful Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
gtprof enable staticcheck QFxxxx rules (#34064) 2025-03-29 17:32:28 -04:00
hcaptcha Consume hcaptcha and pwn deps (#22610) 2023-01-29 09:49:51 -06:00
highlight Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
hostmatcher Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
htmlutil Refactor HTMLFormat, update chroma render, fix js error (#33136) 2025-01-08 03:44:32 +00:00
httpcache Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
httplib Make public URL generation configurable (#34250) 2025-04-22 06:49:37 +08:00
indexer Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
issue/template Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
json Fix some migration and repo name problems (#33986) 2025-03-24 20:26:58 -07:00
label Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
lfs Enable addtional linters (#34085) 2025-04-01 10:14:01 +00:00
lfstransfer Enable addtional linters (#34085) 2025-04-01 10:14:01 +00:00
log Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
markup Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
mcaptcha Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
metrics feat: add label 'state' to metric 'gitea_users' (#34326) 2025-05-07 18:00:53 +00:00
migration Refactor embedded assets and drop unnecessary dependencies (#34692) 2025-06-12 03:59:33 +00:00
nosql Refactor older tests to use testify (#33140) 2025-01-09 09:21:47 +08:00
optional Refactor some file edit related code (#34744) 2025-06-18 01:18:07 +00:00
options Refactor embedded assets and drop unnecessary dependencies (#34692) 2025-06-12 03:59:33 +00:00
packages Fix some package registry problems (#34759) 2025-06-19 00:32:43 +08:00
paginator Only use prev and next buttons for pagination on user dashboard (#33981) 2025-03-23 19:52:43 +00:00
pprof Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
private Fix a bug when uploading file via lfs ssh command (#34408) 2025-05-09 16:17:08 +00:00
process Use test context in tests and new loop system in benchmarks (#33648) 2025-02-20 09:57:40 +00:00
proxy Use proxy for pull mirror (#22771) 2023-02-11 08:39:50 +08:00
proxyprotocol Enable addtional linters (#34085) 2025-04-01 10:14:01 +00:00
public Upgrade gopls to v0.19.0, add make fix (#34772) 2025-06-18 19:30:40 +00:00
queue Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
recaptcha Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
references Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
regexplru Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
repository Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
reqctx Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
secret Upgrade golangci-lint to v1.64.5 (#33654) 2025-02-21 00:05:40 +08:00
session Enforce two-factor auth (2FA: TOTP or WebAuthn) (#34187) 2025-04-28 15:31:59 -07:00
setting Fix remaining issues after gopls modernize formatting (#34771) 2025-06-18 11:37:49 -07:00
sitemap Fix sitemap (#22272) 2022-12-30 23:31:00 +08:00
ssh Update x/crypto package and make builtin SSH use default parameters (#34667) 2025-06-09 19:51:02 +00:00
storage Enable addtional linters (#34085) 2025-04-01 10:14:01 +00:00
structs Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (#34770) 2025-06-19 12:29:10 -07:00
svg Add sub issue list support (#32940) 2024-12-24 01:54:19 +00:00
sync Use global lock instead of NewExclusivePool to allow distributed lock between multiple Gitea instances (#31813) 2024-09-06 10:12:41 +00:00
system Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
tailmsg Support performance trace (#32973) 2025-01-21 18:57:07 +00:00
tempdir Uniform all temporary directories and allow customizing temp path (#32352) 2025-04-08 16:15:28 +00:00
templates Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
test Validate hex colors when creating/editing labels (#34623) 2025-06-07 11:25:08 +03:00
testlogger Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
timeutil Refactor embedded assets and drop unnecessary dependencies (#34692) 2025-06-12 03:59:33 +00:00
translation Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
turnstile Add new captcha: cloudflare turnstile (#22369) 2023-02-05 15:29:03 +08:00
typesniffer Add avif image file support (#32508) 2024-11-15 00:55:50 +00:00
updatechecker Enable addtional linters (#34085) 2025-04-01 10:14:01 +00:00
uri Implement FSFE REUSE for golang files (#21840) 2022-11-27 18:20:29 +00:00
user Refactor older tests to use testify (#33140) 2025-01-09 09:21:47 +08:00
util Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
validation Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
web Run gopls modernize on codebase (#34751) 2025-06-18 01:48:09 +00:00
webhook Add workflow_job webhook (#33694) 2025-03-11 10:40:38 -07:00
zstd Refactor embedded assets and drop unnecessary dependencies (#34692) 2025-06-12 03:59:33 +00:00