Commit Graph

5 Commits

Author SHA1 Message Date
Wenkai Yin
4ef5c1f98a Merge master into dev
Conflicts:
	.travis.yml
	Dockerfile.job
	vendor/vendor.json
2016-08-15 11:30:06 +08:00
Tan Jiang
3f26bca5ed rebuild vendor directory 2016-08-12 14:50:00 +08:00
Tan Jiang
a3b4b1b525 enable redis for ui session 2016-07-22 16:03:09 +08:00
Tan Jiang
72390bb494 move app.conf to Deploy folder 2016-06-30 18:42:35 +08:00
Tan Jiang
9493b8c238 integrate jobservice into docker-compose template 2016-05-27 16:21:32 +08:00