1
1
mirror of https://github.com/go-gitea/gitea synced 2024-11-19 16:44:25 +00:00
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>
2020-04-03 13:09:15 -04:00
..
comments Refactor pull request review (#8954) 2019-11-14 10:57:36 +08:00
externalaccount Allow externalID to be UUID (#8551) 2019-10-17 10:06:28 +08:00
gitdiff Check if diff actually contains sections when rendering (#9926) (#9933) 2020-01-22 08:02:57 +00:00
issue Trigger webhooks on issue label-change via API too (#10421) (#10439) 2020-02-24 14:30:59 +00:00
mailer [BugFix] Avoid mailing explicit unwatched (#10475) (#10500) 2020-02-27 11:42:51 -06:00
mirror Use limited commits (#9572) 2020-01-01 11:54:56 +08:00
pull Fix rebase conflict detection in git 2.26 (#10930) 2020-04-03 13:09:15 -04:00
release Graceful: Cancel Process on monitor pages & HammerTime (#9213) 2019-11-30 16:40:22 +02:00
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) 2020-01-25 17:39:53 +08:00
wiki Move wiki related funtions from models to services/wiki (#9355) 2020-01-07 18:27:36 +00:00