3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-06 19:11:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2024-04-11 13:33:37 +02:00
commit ff04877d24
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/scripts/run.template.sh
View file

@ -23,4 +23,4 @@ export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogMan
ENTRYPOINT=${1:-app.main}; ENTRYPOINT=${1:-app.main};
set -ex set -ex
exec $JAVA_CMD $JVM_OPTS "$@" -jar penpot.jar -m $ENTRYPOINT exec $JAVA_CMD $JVM_OPTS -jar penpot.jar -m $ENTRYPOINT

3
backend/src/app/migrations/v2.clj
View file

@ -57,8 +57,7 @@
migrated? (setup/get-prop system :v2-migrated false)] migrated? (setup/get-prop system :v2-migrated false)]
(when-not migrated? (when-not migrated?
(l/inf :hint "v2 migration started" (l/inf :hint "v2 migration started")
:files (:processed-files stats))
(try (try
(binding [feat/*stats* stats] (binding [feat/*stats* stats]
(db/tx-run! system migrate-teams)) (db/tx-run! system migrate-teams))