zeripath a5440fcb1e Report error if API merge is not allowed (#12528) ... #12496 demonstrated that the API merge needs to return some information as to why a merge has been disallowed with a status code 422. This PR ensures that a reason is always returned. Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv>		2020-08-19 17:35:06 -04:00
..
admin	Pause, Resume, Release&Reopen, Add and Remove Logging from command line (#11777)	2020-07-05 20:07:07 -04:00
api/v1	Report error if API merge is not allowed (#12528)	2020-08-19 17:35:06 -04:00
dev	Display ui time with customize time location (#7792)	2019-08-15 22:46:21 +08:00
events	Add EventSource support (#11235)	2020-05-07 22:49:00 +01:00
org	Move jquery-minicolors to npm/webpack (#12305)	2020-07-29 14:44:23 -04:00
private	Git 2.28 no longer permits diff with ... on unrelated branches (#12364)	2020-07-29 13:53:04 -04:00
repo	Add a storage layer for attachments (#11387)	2020-08-18 12:23:45 +08:00
routes	Kanban board (#8346)	2020-08-16 23:07:38 -04:00
user	Kanban board (#8346)	2020-08-16 23:07:38 -04:00
utils	Re-attempt to delete temporary upload if the file is locked by another process (#12447)	2020-08-11 21:05:34 +01:00
home.go	Ensure public repositories in private organizations are visible and fix admin organizations list (#11465)	2020-05-18 00:27:54 +01:00
init.go	Add a storage layer for attachments (#11387)	2020-08-18 12:23:45 +08:00
install.go	models: fix xorm variable clobber (#12231)	2020-07-13 09:58:55 +01:00
metrics.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
swagger_json.go	Add gitea-vet (#10948)	2020-04-05 07:20:50 +01:00