Commit Graph

10 Commits

Author SHA1 Message Date
Matej Kramny
fe8851bcfe fixes for #310 2017-04-18 16:37:44 +01:00
Matej Kramny
4b6a518b73 fixes resulting from master merge 2017-04-18 14:58:48 +01:00
Matej Kramny
db4948cb89 Merge branch 'master' into develop
# Conflicts:
#	Dockerfile
#	api/login.go
#	api/projects/environment.go
#	api/projects/project.go
#	api/projects/templates.go
#	api/tasks/runner.go
#	api/users.go
#	db/versionHistory.go
#	util/bindata.go
2017-04-18 14:48:31 +01:00
Anton Markelov
e11af62892 add logrus logging, disable LDAP username and password editing on backend 2017-03-28 11:38:53 +10:00
Anton Markelov
a436e97511 fix user alerts updating 2017-03-10 19:54:38 +10:00
Matej Kramny
2a2b7e8aed merge models -> db 2017-02-22 21:12:16 -08:00
Matej Kramny
3f3da12d37 🎉 gin -> net/http 2017-02-22 15:21:49 -08:00
Matej Kramny
1ddfcd5b5f moar refactor
- c.MustGet( -> context.Get(r,
- c.Get( -> context.GetOk(r,
2017-02-22 14:21:52 -08:00
Matej Kramny
2f16f70e98 begin refactor gin -> net/http 2017-02-22 14:17:36 -08:00
Matej Kramny
c58d9ac34f refactoring 2016-05-24 10:55:48 +01:00