3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-14 21:46:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Andrey Antukh 2021-12-27 11:42:44 +01:00
commit 7f5b0f359c
4 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/deps.edn
View file

@ -1,12 +1,6 @@
{ {:deps
;; :mvn/repos {penpot/common {:local/root "../common"}
;; {"central" {:url "https://repo1.maven.org/maven2/"} org.clojure/core.async {:mvn/version "1.5.648"}
;; "clojars" {:url "https://clojars.org/repo"}
;; "jcenter" {:url "https://jcenter.bintray.com/"}
;; }
:deps
{penpot/common
{:local/root "../common"}
;; Logging ;; Logging
org.zeromq/jeromq {:mvn/version "0.5.2"} org.zeromq/jeromq {:mvn/version "0.5.2"}

4
backend/src/app/emails.clj
View file

@ -66,8 +66,8 @@
(:id profile) (:id profile)
(db/interval bounce-max-age)])] (db/interval bounce-max-age)])]
(and (< complaints complaint-threshold) (and (< (or complaints 0) complaint-threshold)
(< bounces bounce-threshold))))) (< (or bounces 0) bounce-threshold)))))
(defn has-complaint-reports? (defn has-complaint-reports?
([conn email] (has-complaint-reports? conn email nil)) ([conn email] (has-complaint-reports? conn email nil))

3
backend/src/app/loggers/mattermost.clj
View file

@ -62,7 +62,8 @@
(when uri (when uri
(l/info :msg "initializing mattermost error reporter" :uri uri) (l/info :msg "initializing mattermost error reporter" :uri uri)
(let [output (a/chan (a/sliding-buffer 128) (let [output (a/chan (a/sliding-buffer 128)
(filter #(= (:level %) "error")))] (filter (fn [event]
(= (:logger/level event) "error"))))]
(receiver :sub output) (receiver :sub output)
(a/go-loop [] (a/go-loop []
(let [msg (a/<! output)] (let [msg (a/<! output)]

3
common/deps.edn
View file

@ -1,7 +1,6 @@
{:deps {:deps
{org.clojure/clojure {:mvn/version "1.10.3"} {org.clojure/clojure {:mvn/version "1.10.3"}
org.clojure/data.json {:mvn/version "2.4.0"} org.clojure/data.json {:mvn/version "2.4.0"}
org.clojure/core.async {:mvn/version "1.4.627"}
org.clojure/tools.cli {:mvn/version "1.0.206"} org.clojure/tools.cli {:mvn/version "1.0.206"}
metosin/jsonista {:mvn/version "0.3.4"} metosin/jsonista {:mvn/version "0.3.4"}
org.clojure/clojurescript {:mvn/version "1.10.891"} org.clojure/clojurescript {:mvn/version "1.10.891"}
@ -34,7 +33,7 @@
;; exception printing ;; exception printing
fipp/fipp {:mvn/version "0.6.24"} fipp/fipp {:mvn/version "0.6.24"}
io.aviso/pretty {:mvn/version "0.1.37"} io.aviso/pretty {:mvn/version "1.1.1"}
environ/environ {:mvn/version "1.2.0"}} environ/environ {:mvn/version "1.2.0"}}
:paths ["src"] :paths ["src"]
:aliases :aliases