Skip to content
Browse files

Merge branch "hotfix/2.0.0-alpha2" into develop

Conflicts:
        project.clj
        src/foreclojure/problems.clj
  • Loading branch information...
2 parents 668ec28 + 8a9f2f8 commit f518d19a43c753518b077929d7ff7791887b06a8 @amalloy amalloy committed Aug 19, 2012
Showing with 7 additions and 9 deletions.
  1. +2 −2 project.clj
  2. +5 −7 src/foreclojure/problems.clj
View
4 project.clj
@@ -1,9 +1,9 @@
-(defproject foreclojure "2.0.0-alpha1"
+(defproject foreclojure "2.0.0-alpha2"
:description "4clojure - a website for learning Clojure"
:dependencies [[org.clojure/clojure "1.4.0"]
[compojure "1.1.0"]
[hiccup "1.0.0"]
- [clojail "0.6.2"]
+ [clojail "0.5.1"]
[lib-noir "0.1.1"]
[congomongo "0.1.9"]
[org.jasypt/jasypt "1.7"]
View
12 src/foreclojure/problems.clj
@@ -14,7 +14,11 @@
[foreclojure.users :only [golfer? get-user-id disable-codebox?]]
[foreclojure.solutions :only [save-solution get-solution]]
[clojail.core :exclude [safe-read]]
+<<<<<<< HEAD
[clojail.testers :only [secure-tester blanket blacklist-symbols]]
+=======
+ [clojail.testers :only [secure-tester]]
+>>>>>>> 8a9f2
[somnium.congomongo :only [update! fetch-one fetch fetch-and-modify destroy!]]
[hiccup.form :only [form-to text-area hidden-field label text-field drop-down]]
[hiccup.element :only [link-to]]
@@ -162,14 +166,8 @@
(def restricted-list '[use require in-ns future agent send send-off pmap pcalls])
-(def base-tester (blanket secure-tester
- "foreclojure"
- "somnium"
- "ring"
- "compojure"))
-
(defn get-tester [restricted]
- (apply blacklist-symbols base-tester (concat restricted-list (map symbol restricted))))
+ (into secure-tester (concat restricted-list (map symbol restricted))))
(def sb (sandbox*))

0 comments on commit f518d19

Please sign in to comment.
Something went wrong with that request. Please try again.