aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2015-05-05 17:23:06 +0100
committerLouise Crow <louise.crow@gmail.com>2015-05-07 15:51:19 +0100
commit02d53d2d80bbf267db3edf88bb4fe782e50a2906 (patch)
tree5192b7068b895bd44dbd593cacd07d0c45275b59
parent8cfea04b6e3dfed3c49f8e9f11d142c7471d414b (diff)
Remove monkeypatch required when running Rails 2.3 under Ruby 1.9
This was added because TMail calls String#is_binary_data? which does not exist in Ruby 1.9.2 onwards. We don't use TMail anymore so this is no longer needed.
-rw-r--r--config/initializers/alaveteli.rb1
-rw-r--r--lib/ruby19.rb8
2 files changed, 0 insertions, 9 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index dbd7aace2..a70f2e0e4 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -35,7 +35,6 @@ end
# Load monkey patches and other things from lib/
-require 'ruby19.rb'
require 'activesupport_cache_extensions.rb'
require 'use_spans_for_errors.rb'
require 'activerecord_errors_extensions.rb'
diff --git a/lib/ruby19.rb b/lib/ruby19.rb
deleted file mode 100644
index 39f48d74e..000000000
--- a/lib/ruby19.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-if RUBY_VERSION.to_f == 1.9
- class String
- # @see syck/lib/syck/rubytypes.rb
- def is_binary_data?
- self.count("\x00-\x7F", "^ -~\t\r\n").fdiv(self.size) > 0.3 || self.index("\x00") unless self.empty?
- end
- end
-end \ No newline at end of file