Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-15 11:38:24 -05:00
Code Issues Activity

Merge branch 'staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2021-04-26 11:24:33 +02:00
commit 2034f0a7c2
4 changed files with 5 additions and 6 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 source ./environ
fi 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 "$@"

2
backend/src/app/http/session.clj
View file

@ -15,8 +15,6 @@
[app.util.logging :as l] [app.util.logging :as l]
[app.util.time :as dt] [app.util.time :as dt]
[app.worker :as wrk] [app.worker :as wrk]
[buddy.core.codecs :as bc]
[buddy.core.nonce :as bn]
[clojure.core.async :as a] [clojure.core.async :as a]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[integrant.core :as ig])) [integrant.core :as ig]))

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

1
frontend/shadow-cljs.edn
View file

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