Merge branch 'master' of https://github.com/rails/rails into performance_test

Conflicts:
	activesupport/lib/active_support/testing/performance.rb

1 files changed, 0 insertions, 44 deletions

diff --git a/activesupport/lib/active_support/json/backends/yajl.rb b/activesupport/lib/active_support/json/backends/yajl.rb
deleted file mode 100644
index 58818658c7..0000000000
--- a/activesupport/lib/active_support/json/backends/yajl.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require 'yajl' unless defined?(Yajl)
-
-module ActiveSupport
-  module JSON
-    module Backends
-      module Yajl
-        ParseError = ::Yajl::ParseError
-        extend self
-
-        # Parses a JSON string or IO and convert it into an object
-        def decode(json)
-          data = ::Yajl::Parser.new.parse(json)
-          if ActiveSupport.parse_json_times
-            convert_dates_from(data)
-          else
-            data
-          end
-        end
-
-      private
-        def convert_dates_from(data)
-          case data
-          when nil
-            nil
-          when DATE_REGEX
-            begin
-              DateTime.parse(data)
-            rescue ArgumentError
-              data
-            end
-          when Array
-            data.map! { |d| convert_dates_from(d) }
-          when Hash
-            data.each do |key, value|
-              data[key] = convert_dates_from(value)
-            end
-          else
-            data
-          end
-        end
-      end
-    end
-  end
-end