Merge branch 'dkrizan/branching-improvements' into dkrizan/cdn-branch-support

Author: dkrizan

.gitignore

@@ -83,3 +83,6 @@ ngrok.local.yml
 
 # Sentry Config File
 /webapp/.env.sentry-build-plugin
+
+# Worktree
+/worktree-env.sh

CHANGELOG.md

@@ -1,3 +1,24 @@
+## [3.156.3](https://github.com/tolgee/tolgee-platform/compare/v3.156.2...v3.156.3) (2026-02-11)
+
+
+### Bug Fixes
+
+* stop doubling percent signs in Compose Multiplatform XML export ([#3465](https://github.com/tolgee/tolgee-platform/issues/3465)) ([67d2e29](https://github.com/tolgee/tolgee-platform/commit/67d2e299155b9991a242ad7a3ce7bb6ea8f1ab26)), closes [#3368](https://github.com/tolgee/tolgee-platform/issues/3368)
+
+## [3.156.2](https://github.com/tolgee/tolgee-platform/compare/v3.156.1...v3.156.2) (2026-02-09)
+
+
+### Bug Fixes
+
+* use project base language for xcstrings sourceLanguage field ([#3446](https://github.com/tolgee/tolgee-platform/issues/3446)) ([b0a050e](https://github.com/tolgee/tolgee-platform/commit/b0a050eacfdc1d54587dcb2adcac916983626316))
+
+## [3.156.1](https://github.com/tolgee/tolgee-platform/compare/v3.156.0...v3.156.1) (2026-02-08)
+
+
+### Bug Fixes
+
+* stop escaping percent signs in Compose Multiplatform XML export ([#3457](https://github.com/tolgee/tolgee-platform/issues/3457)) ([86d4a1a](https://github.com/tolgee/tolgee-platform/commit/86d4a1a5159abf94d239198a890c6e1bf732bea5)), closes [#3368](https://github.com/tolgee/tolgee-platform/issues/3368)
+
 # [3.156.0](https://github.com/tolgee/tolgee-platform/compare/v3.155.0...v3.156.0) (2026-02-06)
 
 

backend/app/src/main/resources/application-cli.yaml

@@ -12,9 +12,9 @@ tolgee:
     createImplicitApiKey: true
     baseLanguageTag: en
   postgres-autostart:
-    container-name: tolgee-postgres-cli
-    port: 64321
+    container-name: ${TOLGEE_CLI_PG_CONTAINER:tolgee-postgres-cli}
+    port: ${TOLGEE_CLI_PG_PORT:64321}
   billing:
     enabled: false
 server:
-  port: 22222
+  port: ${TOLGEE_CLI_PORT:22222}

backend/app/src/main/resources/application-e2e.yaml

@@ -12,7 +12,7 @@ tolgee:
         token-price-in-credits-output: 1.5
   billing:
     enabled: false
-  frontend-url: http://localhost:8202
+  frontend-url: http://localhost:${TOLGEE_E2E_FRONTEND_PORT:8202}
   authentication:
     enabled: true
     needs-email-verification: true
@@ -48,7 +48,7 @@ tolgee:
     global-limits: false
     endpoint-limits: false
     authentication-limits: false
-  file-storage-url: http://localhost:8201
+  file-storage-url: http://localhost:${TOLGEE_E2E_PORT:8201}
   internal:
     controller-enabled: true
     fake-third-party-login: true
@@ -57,7 +57,7 @@ tolgee:
     fake-llm-providers: true
   smtp:
     host: localhost
-    port: 21025
+    port: ${TOLGEE_E2E_SMTP_PORT:21025}
     ssl-enabled: false
     auth: false
     tls-enabled: false
@@ -89,10 +89,10 @@ tolgee:
   batch:
     concurrency: 10
   postgres-autostart:
-    container-name: tolgee-postgres-e2e
-    port: 58532
+    container-name: ${TOLGEE_E2E_PG_CONTAINER:tolgee-postgres-e2e}
+    port: ${TOLGEE_E2E_PG_PORT:58532}
 server:
-  port: 8201
+  port: ${TOLGEE_E2E_PORT:8201}
   error:
     include-exception: true
     include-stacktrace: always

backend/app/src/test/kotlin/io/tolgee/batch/AbstractBatchJobConcurrentTest.kt

@@ -34,6 +34,7 @@ import org.mockito.kotlin.doAnswer
 import org.mockito.kotlin.whenever
 import org.redisson.api.RedissonClient
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.util.TestPropertyValues
 import org.springframework.context.ApplicationContextInitializer
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean
@@ -59,6 +60,9 @@ abstract class AbstractBatchJobConcurrentTest :
     class Initializer : ApplicationContextInitializer<ConfigurableApplicationContext> {
       override fun initialize(configurableApplicationContext: ConfigurableApplicationContext) {
         redisRunner.run()
+        TestPropertyValues
+          .of("spring.data.redis.port=${RedisRunner.port}")
+          .applyTo(configurableApplicationContext)
       }
     }
   }

backend/app/src/test/kotlin/io/tolgee/batch/BatchJobConcurrencyTest.kt

@@ -17,7 +17,6 @@ import java.util.concurrent.atomic.AtomicInteger
     "tolgee.cache.use-redis=true",
     "tolgee.cache.enabled=true",
     "tolgee.websocket.use-redis=true",
-    "spring.redis.port=56379",
     "tolgee.batch.concurrency=10",
   ],
   webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,

backend/app/src/test/kotlin/io/tolgee/batch/BatchJobFailureAndCancellationTest.kt

@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger
     "tolgee.cache.use-redis=true",
     "tolgee.cache.enabled=true",
     "tolgee.websocket.use-redis=true",
-    "spring.redis.port=56379",
     "tolgee.batch.concurrency=10",
   ],
   webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,

backend/app/src/test/kotlin/io/tolgee/batch/BatchJobNoOpPerformanceWithRedisTest.kt

@@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.test.util.TestPropertyValues
 import org.springframework.context.ApplicationContextInitializer
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.context.annotation.Bean
@@ -46,7 +47,6 @@ import org.springframework.transaction.PlatformTransactionManager
     "tolgee.cache.use-redis=true",
     "tolgee.cache.enabled=true",
     "tolgee.websocket.use-redis=true",
-    "spring.redis.port=56379",
   ],
   webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 )
@@ -79,6 +79,9 @@ class BatchJobNoOpPerformanceWithRedisTest :
     class Initializer : ApplicationContextInitializer<ConfigurableApplicationContext> {
       override fun initialize(configurableApplicationContext: ConfigurableApplicationContext) {
         redisRunner.run()
+        TestPropertyValues
+          .of("spring.data.redis.port=${RedisRunner.port}")
+          .applyTo(configurableApplicationContext)
       }
     }
   }

backend/app/src/test/kotlin/io/tolgee/batch/BatchJobParallelExecutionTest.kt

@@ -15,7 +15,6 @@ import org.springframework.test.context.ContextConfiguration
     "tolgee.cache.use-redis=true",
     "tolgee.cache.enabled=true",
     "tolgee.websocket.use-redis=true",
-    "spring.redis.port=56379",
     "tolgee.batch.concurrency=10",
   ],
   webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,

backend/app/src/test/kotlin/io/tolgee/batch/BatchJobProgressTest.kt

@@ -18,7 +18,6 @@ import org.springframework.test.context.ContextConfiguration
     "tolgee.cache.use-redis=true",
     "tolgee.cache.enabled=true",
     "tolgee.websocket.use-redis=true",
-    "spring.redis.port=56379",
     "tolgee.batch.concurrency=10",
   ],
   webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,