Commit Graph

19 Commits

Author SHA1 Message Date
Anton Romanov
e16b1da761 fix script 2019-04-23 12:46:17 +04:00
Anton Romanov
09cae66ca4 fix image 2019-04-23 12:38:15 +04:00
Anton Romanov
7684bac74d Merge branch 'dev' into move-to-jdk11
# Conflicts:
#	build.gradle
#	src/main/java/ru/ulstu/grant/model/GrantDto.java
#	src/main/java/ru/ulstu/grant/service/GrantService.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/java/ru/ulstu/project/model/Project.java
2019-04-23 11:35:41 +04:00
Anton Romanov
4615183ae4 #102 temporary skip tests until fix docker container 2019-04-17 17:46:06 +04:00
Anton Romanov
49a379ab3c #102 temporary skip tests until fix docker container 2019-04-17 17:37:43 +04:00
Anton Romanov
0feef9016a #83 disable cache 2019-04-05 17:48:23 +04:00
Anton Romanov
94dabd07fb #83 fix code 2019-04-05 17:47:10 +04:00
Anton Romanov
7a7dfb337f #83 fix postgres service 2019-04-05 17:41:31 +04:00
Anton Romanov
c7cdbe9044 #83 add tasks, modify build script for passing application properties 2019-04-05 17:35:17 +04:00
Anton Romanov
fe1820d540 #83 try to change container 2019-04-05 16:37:03 +04:00
Anton Romanov
4a05d52e4c #83 try to change container 2019-04-05 16:25:10 +04:00
Anton Romanov
bbc398251f #83 try to change container 2019-04-05 16:16:40 +04:00
Anton Romanov
103ff05846 fix displaying commits 2019-03-28 15:53:31 +03:00
Anton Romanov
c374cb4232 merge deploy environments 2019-03-18 22:35:01 +04:00
Anton Romanov
d35e0f7ba3 add environment 2019-03-18 22:25:28 +04:00
Anton Romanov
3d8e8ca4f2 fix branch 2019-03-01 11:27:57 +04:00
Anton Romanov
cbcc006b13 deploy on vps 2018-09-06 22:50:34 +04:00
Anton Romanov
0a2a8c503c add ci 2018-05-04 17:54:46 +04:00
Anton Romanov
9e4e3834d2 copy from landing 2018-04-28 22:50:26 +04:00