zo/pronoun.fyi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #92 from witch-house/fix-ring-devel-dep

Browse Source 
Put ring-devel back in main dependencies
This commit is contained in:
Morgan Astra 2018-11-15 01:02:48 -08:00 committed by GitHub
commit 04d94c8935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project.clj
View File

@ -2,11 +2,13 @@
:description "Pronoun.is is a website for personal pronoun usage examples" :description "Pronoun.is is a website for personal pronoun usage examples"
:url "https://pronoun.is" :url "https://pronoun.is"
:license "GNU Affero General Public License 3.0" :license "GNU Affero General Public License 3.0"
:dependencies [[org.clojure/clojure "1.9.0"] :dependencies [[compojure "1.6.1"]
[compojure "1.6.1"]
[ring/ring-jetty-adapter "1.7.1"]
[environ "1.1.0"] [environ "1.1.0"]
[hiccup "1.0.5"]] [hiccup "1.0.5"]
[lambdaisland/ring.middleware.logger "0.5.1"]
[org.clojure/clojure "1.9.0"]
[ring/ring-devel "1.7.1"]
[ring/ring-jetty-adapter "1.7.1"]]
:min-lein-version "2.0.0" :min-lein-version "2.0.0"
:plugins [[environ/environ.lein "0.2.1"] :plugins [[environ/environ.lein "0.2.1"]
[lein-ring "0.9.7"]] [lein-ring "0.9.7"]]
@ -14,6 +16,5 @@
:uberjar-name "pronouns-standalone.jar" :uberjar-name "pronouns-standalone.jar"
;; FIXME morgan.astra <2018-11-14 Wed> ;; FIXME morgan.astra <2018-11-14 Wed>
;; Is this production profile used for anything? ;; Is this production profile used for anything?
:profiles {:production {:env {:production true}} :profiles {:production {:env {:production true}}}
:test {:dependencies [[ring/ring-devel "1.7.1"]]}}
:ring {:handler pronouns.web/app}) :ring {:handler pronouns.web/app})

8
src/pronouns/web.clj
View File

@ -21,9 +21,7 @@
[clojure.string :as s] [clojure.string :as s]
[clojure.java.io :as io] [clojure.java.io :as io]
[ring.adapter.jetty :as jetty] [ring.adapter.jetty :as jetty]
;; FIXME morgan.astra <2018-11-14 Wed> [ring.middleware.logger :as logger]
;; make this logger work or use another one
;; [ring.middleware.logger :as logger]
[ring.middleware.stacktrace :as trace] [ring.middleware.stacktrace :as trace]
[ring.middleware.params :as params] [ring.middleware.params :as params]
[ring.middleware.resource :refer [wrap-resource]] [ring.middleware.resource :refer [wrap-resource]]
@ -79,9 +77,7 @@
;; (wrap-resource "images") ;; (wrap-resource "images")
wrap-content-type wrap-content-type
wrap-not-modified wrap-not-modified
;; FIXME morgan.astra <2018-11-14 Wed> logger/wrap-with-logger
;; make this logger work or use another one
;logger/wrap-with-logger
wrap-error-page wrap-error-page
wrap-gnu-natalie-nguyen wrap-gnu-natalie-nguyen
trace/wrap-stacktrace trace/wrap-stacktrace