David Svantesson 5316bdfd85 Merge remote-tracking branch 'upstream/master' into team-grant-all-repos ... # Conflicts: # models/migrations/migrations.go # models/migrations/v90.go # models/repo.go		2019-10-05 14:41:44 +02:00
..
admin	Move all mail related codes from models to services/mailer (#7200)	2019-09-24 13:02:49 +08:00
convert	Merge remote-tracking branch 'upstream/master' into team-grant-all-repos	2019-10-05 14:41:44 +02:00
misc	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
org	Merge remote-tracking branch 'upstream/master' into team-grant-all-repos	2019-10-05 14:41:44 +02:00
repo	Api: advanced settings for repository (external wiki, issue tracker etc.) (#7756)	2019-10-02 17:30:41 +08:00
swagger	Add API endpoint for accessing repo topics (#7963)	2019-09-03 23:46:24 +08:00
user	Remove legacy handling of drone token (#8191)	2019-09-17 15:13:24 +03:00
utils	Implement webhook branch filter (#7791)	2019-09-09 08:48:21 +03:00
api.go	API endpoint for searching teams. (#8108)	2019-10-01 13:32:28 +08:00