Permalink
Browse files

Merge branch 'master' into 0.3-beta

  • Loading branch information...
2 parents 007302a + 459d732 commit efdb976779da4bc485f70ca9005ad3cbec2abe8b @weavejester weavejester committed Jul 25, 2010
Showing with 5 additions and 4 deletions.
  1. +3 −1 README.md
  2. +2 −3 ring-core/src/ring/util/response.clj
View
4 README.md
@@ -99,7 +99,9 @@ To include all of them, add:
## Development
-Ring is being actively developed; you can track its progress and contribute at the project's [GitHub page](http://github.com/mmcgrana/ring) and [Google Group](http://groups.google.com/group/ring-clojure).
+Ring is being actively developed; you can track its progress on the [GitHub page](http://github.com/mmcgrana/ring) page and on the [Google Group](http://groups.google.com/group/ring-clojure).
+
+To submit a patch, please post your corresponding GitHub branch to the Ring Google Group. This allows your changes to be seen and discussed by all Ring developers. If you are attempting something substantial, consider posting to the Google Group first with your idea.
To run the Ring unit tests, first navigate to the appropriate project and then:
View
5 ring-core/src/ring/util/response.clj
@@ -61,9 +61,8 @@
:root - take the resource relative to this root"
[path & [opts]]
(let [path (str (:root opts "") "/" path)
- path (.replace path "//" "/")
- loader (clojure.lang.RT/baseLoader)]
- (if-let [resource (.getResourceAsStream loader path)]
+ path (.replace path "//" "/")]
+ (if-let [resource (.getResourceAsStream (class file-response) path)] ; any Ring fn will do here
(response resource))))
(defn status

0 comments on commit efdb976

Please sign in to comment.