mirror of
https://github.com/penpot/penpot.git
synced 2025-02-10 09:08:31 -05:00
Merge branch 'staging' into develop
This commit is contained in:
commit
2034f0a7c2
4 changed files with 5 additions and 6 deletions
|
@ -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 "$@"
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
[app.util.logging :as l]
|
||||
[app.util.time :as dt]
|
||||
[app.worker :as wrk]
|
||||
[buddy.core.codecs :as bc]
|
||||
[buddy.core.nonce :as bn]
|
||||
[clojure.core.async :as a]
|
||||
[clojure.spec.alpha :as s]
|
||||
[integrant.core :as ig]))
|
||||
|
|
|
@ -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,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"]
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue