Jonas Franz 6d00c1a7ce Merge branch 'master' into feat/approval-new ...

# Conflicts:
#	models/issue_comment.go
#	models/migrations/migrations.go
#	models/migrations/v64.go
#	models/models.go
#	public/css/index.css

2018-05-13 22:14:34 +02:00

..

ldap

Add option to use paged LDAP search when synchronizing users (#3895)

2018-05-05 17:30:47 +03:00

oauth2

Store OAuth2 session data in database (#3660)

2018-04-29 09:09:24 +03:00

openid

Run "make fmt" with go-1.6 (#1333)

2017-03-21 08:55:00 +08:00

pam

golint fixed for modules/auth

2016-11-27 21:39:06 +08:00

admin.go

Better URL validation (#1507)

2017-04-19 11:02:20 +08:00

auth_form.go

Add option to use paged LDAP search when synchronizing users (#3895)

2018-05-05 17:30:47 +03:00

auth.go

Refactor struct's time to remove unnecessary memory usage (#3142)

2017-12-11 06:37:04 +02:00

org.go

Add units to team (#947)

2017-05-18 22:54:24 +08:00

repo_branch_form.go

Create new branch from branch selection dropdown (#2130)

2017-10-15 22:59:24 +03:00

repo_form.go

Merge branch 'master' into feat/approval-new

2018-05-13 22:14:34 +02:00

user_form_auth_openid.go

Run "make fmt" with go-1.6 (#1333)

2017-03-21 08:55:00 +08:00

user_form.go

issue-2768: added new option allow_only_external_registration (#3910)

2018-05-13 15:51:16 +08:00