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

..

e2e

Enable addtional linters (#34085)

2025-04-01 10:14:01 +00:00

fuzz

Fix fuzz test (#33156)

2025-01-09 15:15:47 +08:00

gitea-lfs-meta

Test views of LFS files (#22196)

2022-12-23 07:41:56 +08:00

gitea-repositories-meta

Support choose email when creating a commit via web UI (more) (#33445)

2025-01-31 02:36:18 +00:00

integration

Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (#34770)

2025-06-19 12:29:10 -07:00

testdata/data

Add artifacts test fixture (#30300)

2024-11-01 10:29:54 +08:00

mssql.ini.tmpl

Fix LFS URL (#33840)

2025-03-10 17:36:02 +08:00

mysql.ini.tmpl

Fix LFS URL (#33840)

2025-03-10 17:36:02 +08:00

pgsql.ini.tmpl

Fix LFS URL (#33840)

2025-03-10 17:36:02 +08:00

sqlite.ini.tmpl

Fix LFS URL (#33840)

2025-03-10 17:36:02 +08:00

test_utils.go

Uniform all temporary directories and allow customizing temp path (#32352)

2025-04-08 16:15:28 +00:00