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
..
ldap	Abort syncrhonization from LDAP source if there is some error. (#7960)	2019-08-24 21:53:37 +03:00
oauth2	migrate gplus to google oauth2 provider (#7885)	2019-09-14 12:02:39 +02:00
openid	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
pam	golint fixed for modules/auth	2016-11-27 21:39:06 +08:00
admin.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
auth.go	Implement webhook branch filter (#7791)	2019-09-09 08:48:21 +03:00
auth_form.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
org.go	Merge remote-tracking branch 'upstream/master' into team-grant-all-repos	2019-10-05 14:41:44 +02:00
repo_branch_form.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
repo_form.go	Refuse merge until all required status checks success (#7481)	2019-09-18 08:39:45 +03:00
repo_form_test.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
user_form.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
user_form_auth_openid.go	Use gitea forked macaron (#7933)	2019-08-23 12:40:29 -04:00
user_form_test.go	Block registration based on email domain (#5157)	2018-11-14 20:00:04 -05:00