Merge branch 'master' into develop

This commit is contained in:
Morgan Astra 2018-11-14 12:52:52 -08:00
commit 4eb4553681
3 changed files with 9 additions and 7 deletions

View File

@ -30,11 +30,11 @@ zie hir hir hirs hirself
si hyr hyr hyrs hyrself si hyr hyr hyrs hyrself
kit kit kits kits kitself kit kit kits kits kitself
ne nem nir nirs nemself ne nem nir nirs nemself
fey feym feir feirs feirself fey fem feir feirs feirself
xie xer xer xers xerself xie xer xer xers xerself
vi ver ver vers verself vi ver ver vers verself
vi vim vir virs vimself vi vim vir virs vimself
vi vim vim vims vimself vi vim vim vims vimself
yo yo yos yos yosself yo yo yos yos yosself
shi hir hir hirs hirself shi hir hir hirs hirself
ae aer aer aers aerself ae aer aer aers aerself

View File

@ -103,10 +103,6 @@
(twitter-name "morganastra") (twitter-name "morganastra")
", whose " ", whose "
(href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she")] (href "http://pronoun.is/ze/zir?or=she" "pronoun.is/ze/zir?or=she")]
[:p "Want to support this and similar websites? "
"Join us on "
(href "https://www.patreon.com/user?u=5238484" "Patreon")
"!"]
[:p "pronoun.is is free software under the " [:p "pronoun.is is free software under the "
(href "https://www.gnu.org/licenses/agpl.html" "AGPLv3") (href "https://www.gnu.org/licenses/agpl.html" "AGPLv3")
"! visit the project on " "! visit the project on "
@ -184,7 +180,7 @@
[:body [:body
(header-block title) (header-block title)
[:div {:class "section examples"} [:div {:class "section examples"}
[:p [:h2 (str "We couldn't find those pronouns in our database." [:p [:h2 (str "We couldn't find those pronouns in our database. "
"If you think we should have them, please reach out!")]]] "If you think we should have them, please reach out!")]]]
(footer-block)]]))) (footer-block)]])))

View File

@ -50,6 +50,11 @@
(ANY "*" [] (ANY "*" []
(route/not-found (slurp (io/resource "404.html"))))) (route/not-found (slurp (io/resource "404.html")))))
(defn wrap-gnu-natalie-nguyen [handler]
(fn [req]
(when-let [resp (handler req)]
(assoc-in resp [:headers "X-Clacks-Overhead"] "GNU Natalie Nguyen"))))
(defn wrap-error-page [handler] (defn wrap-error-page [handler]
(fn [req] (fn [req]
(try (handler req) (try (handler req)
@ -66,6 +71,7 @@
wrap-not-modified wrap-not-modified
;logger/wrap-with-logger ;logger/wrap-with-logger
wrap-error-page wrap-error-page
wrap-gnu-natalie-nguyen
trace/wrap-stacktrace trace/wrap-stacktrace
params/wrap-params)) params/wrap-params))