diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-14 17:47:27 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-14 17:47:27 +1100 |
| commit | b661acbf4e15f94c7886970ded41bd8c1d6adb97 (patch) | |
| tree | 4893cf92018662afa6914f03ba29bd5da7bcc523 | |
| parent | 0f0b36c8883605dbe0cfc663a7b046f3a1a8d196 (diff) | |
Revert "Switched to a forked version of rails_xss that includes a fix we need"
This reverts commit 0f0b36c8883605dbe0cfc663a7b046f3a1a8d196.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 3 insertions, 9 deletions
@@ -42,7 +42,7 @@ gem 'capistrano' gem 'syslog_protocol' gem 'newrelic_rpm' # We won't need rails_xss once we've upgrade to Rails 3. It's baked in. -gem 'rails_xss', :git => "git://github.com/henare/rails_xss.git", :branch => 'alaveteli' +gem 'rails_xss' # erubis is required by rails_xss gem 'erubis' diff --git a/Gemfile.lock b/Gemfile.lock index 6c5ff211e..e882c0b39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,3 @@ -GIT - remote: git://github.com/henare/rails_xss.git - revision: 6c9b5dccc6050b993b174eba8d15e4bcf1a9120f - branch: alaveteli - specs: - rails_xss (0.3.1) - GEM remote: http://rubygems.org/ specs: @@ -92,6 +85,7 @@ GEM activeresource (= 2.3.14) activesupport (= 2.3.14) rake (>= 0.8.3) + rails_xss (0.3.1) rake (0.8.7) rbx-require-relative (0.0.9) rdoc (2.4.3) @@ -175,7 +169,7 @@ DEPENDENCIES pg rack (~> 1.1.0) rails (= 2.3.14) - rails_xss! + rails_xss rake (~> 0.8.7) rdoc (~> 2.4.3) recaptcha (~> 0.3.1) |