Sergio Benitez aa9c36514f Merged conflicts.

2015-09-04 20:49:07 -07:00

..

cron

…

migrations

…

access.go

#1458: Authorities were messed up when using mysql database

2015-08-28 13:51:15 +08:00

action.go

#1544 better tmp dir name for creating repo

2015-09-03 04:44:20 -04:00

admin.go

…

error.go

PR: nothing to commit and has pull request check

2015-09-02 05:09:12 -04:00

git_diff.go

…

issue.go

#1545 prevent duplicated refs of issues in single commit

2015-09-03 04:34:08 -04:00

login.go

Added LDAP simple auth support.

2015-09-04 20:48:34 -07:00

models_sqlite.go

…

models.go

#1569 force InnoDB for MySQL

2015-09-03 05:05:58 -04:00

oauth2.go

…

org.go

#1458: Authorities were messed up when using mysql database

2015-08-28 13:51:15 +08:00

publickey.go

#1535 Removing deploy key does not remove key

2015-08-25 03:30:39 +08:00

release.go

…

repo.go

#1577 explore paginator problem

2015-09-04 05:54:22 -04:00

token.go

#842 able to use access token replace basic auth

2015-09-02 02:40:15 -04:00

update.go

…

user.go

fix #1568

2015-09-03 03:58:44 -04:00

webhook_slack.go

webhook APIs

2015-08-29 11:49:59 +08:00

webhook.go

webhook APIs

2015-08-29 11:49:59 +08:00