Commit 12b537e4 authored by Enriko Käsper's avatar Enriko Käsper
Browse files

Merge branch 'develop' into 'master'

Enriko Käsper merge request for: develop to master

See merge request teis/common-api-gateway!84
parents 8dad8c02 acca6f75
Pipeline #1091 failed
--liquibase formatted sql
--changeset raigo:integtest_setup
CREATE USER teis;
CREATE SCHEMA cache;
CREATE SCHEMA camunda;
......@@ -19,7 +19,7 @@
},
{
"key": "url_mailserver",
"value": "https://teis-mail.test.tehik.ee/api",
"value": "https://teis-mail.arendus.tehik.ee/api",
"enabled": true
},
{
......
......@@ -17,6 +17,11 @@
"value": "https://teis-ametnik.test.tehik.ee/api-admin",
"enabled": true
},
{
"key": "url_mailserver",
"value": "https://teis-mail.test.tehik.ee/api",
"enabled": true
},
{
"key": "test_data_reset_magic",
"value": "cia",
......
......@@ -33,7 +33,7 @@ spring:
password: ${DB_OWNER_PASSWORD}
contexts: ${ENV_GLOBAL_PROFILES:local}
parameters:
db_app_username: ${DB_APP_USERNAME:teisdb_user}
db_app_username: ${DB_APP_USERNAME:teis}
jpa:
properties:
hibernate:
......@@ -50,8 +50,8 @@ spring:
servlet:
multipart:
enabled: false
max-file-size: 10MB
max-request-size: 10MB
max-file-size: 50MB
max-request-size: 50MB
management:
endpoint:
......@@ -92,7 +92,7 @@ teis:
update-timeout: ${RABBIT_TEMPLATE_GW_EXCHANGE_REPLY_TIMEOUT:6000}
upload:
allowed-extensions: gif, jpg, png, jpeg, tif, doc, docx, pdf, xls, xlsx, odt, ods, txt, rtf, cdoc, ddoc, bdoc, asice, sce, xps, csv, xml, htm, html, msg, zip
max-size: 10485760
max-size: 50000000
minio:
url: ${S3_HOST:localhost}
access-key: ${S3_ACCESS_KEY:s3MinioAccessKey}
......
......@@ -2,6 +2,7 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<include file="classpath:common/db/changelog/common-master.xml"/>
<include file="classpath:common/db/changelog/camunda-7-10.xml" />
</databaseChangeLog>
theGroup=ee.sm.ti.teis
//commonApiGatewayVersion=forSearch ^commonApiGatewayVersion=.*?-SNAPSHOT
theVersion=0.24.0
commonsVersion=0.23.0
theVersion=0.24.1
commonsVersion=0.23.3
pluginVersion=0.0.19-SNAPSHOT
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment