Commit graph

8 commits

Author SHA1 Message Date
Халтобин Евгений
44f9351cde DEVOPS-1898 fixes from Pavel 2025-01-24 14:07:15 +03:00
Халтобин Евгений
b87b35a81e Merge remote-tracking branch 'origin/develop' into develop 2025-01-15 14:04:08 +03:00
Халтобин Евгений
f83e3a7582 fix 2025-01-15 14:03:41 +03:00
kochetkov
fe42948496 Merge branch 'hotfix/1.9.5' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
#	backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java
#	config/nginx.conf
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-01-15 13:31:11 +03:00
Pavel Zilke
45f7e2db8b DEVOPS-1892 nginx.conf grooming 2025-01-14 10:25:30 +03:00
kochetkov
db7f6bee97 some nginx conf from rtsk sources 2025-01-14 10:07:15 +03:00
Халтобин Евгений
18df83f0e2 DEVOPS-1892: added cache settings
moved from angie to nginx
2024-12-23 10:14:02 +03:00
Zaripov Emil
fcb0736bd5 fix by Pavel 2024-09-18 10:25:30 +03:00