You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gitea/services
6543 f7d7cf4e2d
Fix rebase conflict detection in git 2.26 (#10930)
Git changed the technique used in rebase from
simple apply-patches to use merge. This breaks
our conflict detection code.

created by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
5 years ago
..
comments Refactor pull request review (#8954) 5 years ago
externalaccount Allow externalID to be UUID (#8551) 5 years ago
gitdiff Check if diff actually contains sections when rendering (#9926) (#9933) 5 years ago
issue Trigger webhooks on issue label-change via API too (#10421) (#10439) 5 years ago
mailer [BugFix] Avoid mailing explicit unwatched (#10475) (#10500) 5 years ago
mirror Use limited commits (#9572) 5 years ago
pull Fix rebase conflict detection in git 2.26 (#10930) 5 years ago
release Graceful: Cancel Process on monitor pages & HammerTime (#9213) 5 years ago
repository Fix pull view when head repository or head branch missed and close related pull requests when delete head repository or head branch (#9927) (#9974) 5 years ago
wiki Move wiki related funtions from models to services/wiki (#9355) 5 years ago