mirror
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gitea/services
History
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 Keeping consistent between UI and API about combined commit status state and fix some bugs (#34562) 2025-06-09 04:05:33 +00:00
agit Option to delay conflict checking of old pull requests until page view (#27779) 2025-04-24 19:26:57 +00:00
asymkey Improve instance wide ssh commit signing (#34341) 2025-06-11 10:32:55 +00:00
attachment Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
auth Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
automerge Option to delay conflict checking of old pull requests until page view (#27779) 2025-04-24 19:26:57 +00:00
context Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
contexttest Add API endpoint to request contents of multiple files simultaniously (#34139) 2025-04-22 01:20:11 +08:00
convert Fix pull requests API convert panic when head repository is deleted. (#34685) 2025-06-10 20:19:52 -07:00
cron Use default Git timeout when checking repo health (#33593) 2025-02-14 15:13:56 +00:00
doctor Remove unused param `doer` (#34545) 2025-06-18 03:12:16 +00:00
externalaccount Enable addtional linters (#34085) 2025-04-01 10:14:01 +00:00
feed Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
forms Allow renaming/moving binary/LFS files in the UI (#34350) 2025-06-16 17:15:07 -07:00
git Fix GetUsersByEmails (#34643) 2025-06-07 18:30:36 +00:00
gitdiff Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
indexer Update issue indexer after merging a PR (#30715) 2024-05-08 14:45:15 +00:00
issue Fix doctor deleting orphaned issues attachments (#34142) 2025-05-30 05:06:03 +00:00
lfs Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
mailer Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
markup Refactor Git Attribute & performance optimization (#34154) 2025-04-11 21:41:29 +08:00
migrations Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
mirror Only git operations should update `last changed` of a repository (#34388) 2025-05-11 19:18:46 +00:00
notify Add workflow_job webhook (#33694) 2025-03-11 10:40:38 -07:00
oauth2_provider Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
org Remove unused param `doer` (#34545) 2025-06-18 03:12:16 +00:00
packages Upgrade `gopls` to v0.19.0, add `make fix` (#34772) 2025-06-18 19:30:40 +00:00
projects Enable addtional linters (#34085) 2025-04-01 10:14:01 +00:00
pull Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
release Enable testifylint rules (#34075) 2025-03-31 01:53:48 -04:00
repository Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (#34770) 2025-06-19 12:29:10 -07:00
secrets Added Description Field for Secrets and Variables (#33526) 2025-03-17 19:24:54 +00:00
task Fix bug when migrating repository (#34182) 2025-04-14 04:48:03 +00:00
uinotification Penultimate round of `db.DefaultContext` refactor (#27414) 2023-10-11 04:24:07 +00:00
user Fix last admin check when syncing users (#34649) 2025-06-09 20:57:45 +00:00
versioned_migration Add global lock for migrations to make upgrade more safe with multiple replications (#33706) 2025-03-07 21:08:53 +00:00
webhook Refactor some tests (#34580) 2025-06-03 01:26:19 +00:00
webtheme Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00
wiki Run `gopls modernize` on codebase (#34751) 2025-06-18 01:48:09 +00:00