deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update Rails, rails_xss and Bundler

Browse source 
Update Bundler to 1.0.15.
Update Rails to 2.3.12.
Update rails_xss plugin.

The latter two were the
source of a considerable
amount of grief, as rails_xss
is now MUCH stricter about what
string methods can be used.

Also made it possible to use
rake 0.9.x with Instiki. But
you probably REALLY want to use

 ruby bundle exec rake ...

instead of just saying

 rake ....
This commit is contained in:
Jacques Distler 2011-06-15 00:43:38 -05:00
parent ec443685a6
commit 9e909d5be3
1105 changed files with 14278 additions and 4667 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendor/plugins/rails_xss/init.rb vendored
View file

@ -1,5 +1,7 @@
unless $gems_rake_task
if !(Rails::VERSION::MAJOR.to_i >= 2 && Rails::VERSION::MINOR.to_i >=3 && Rails::VERSION::TINY.to_i >=8)
if Rails::VERSION::MAJOR >= 3
$stderr.puts "You don't need to install rails_xss as a plugin for Rails 3 and after."
elsif Rails::VERSION::MAJOR <= 2 && Rails::VERSION::MINOR <= 3 && Rails::VERSION::TINY <= 7
$stderr.puts "rails_xss requires Rails 2.3.8 or later. Please upgrade to enable automatic HTML safety."
else
require 'rails_xss'