Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-07 23:08:24 -05:00
Code Issues Activity

Merge branch 'main' into staging

Browse source
This commit is contained in:
Andrey Antukh 2021-04-26 11:23:55 +02:00
commit ce5429a531
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,4 +16,4 @@ if [ -f ./environ ]; then
source ./environ
fi
exec $JAVA_CMD $JVM_OPTS -classpath $(cat classpath) -Dlog4j2.configurationFile=./log4j2.xml clojure.main -m app.cli.manage "\$@"
exec $JAVA_CMD $JVM_OPTS -classpath $(cat classpath) -Dlog4j2.configurationFile=./log4j2.xml clojure.main -m app.cli.manage "$@"

6
backend/src/app/rpc/mutations/profile.clj
View file

@ -135,11 +135,11 @@
"Returns true if email's domain is in the given whitelist or if given
whitelist is an empty string."
[whitelist email]
(if (str/blank? whitelist)
(if (str/empty-or-nil? whitelist)
true
(let [domains (str/split whitelist #",\s*")
email-domain (second (str/split email #"@"))]
(contains? (set domains) email-domain))))
domain (second (str/split email #"@" 2))]
(contains? (set domains) domain))))
(def ^:private sql:profile-existence
"select exists (select * from profile

1
frontend/shadow-cljs.edn
View file

@ -1,6 +1,7 @@
{:http {:port 3448}
:nrepl {:port 3447}
:jvm-opts ["-Xmx700m" "-Xms100m" "-XX:+UseSerialGC"]
:dev-http {8888 "classpath:public"}
:source-paths ["src", "vendor", "resources", "../common"]