projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9ccc6e
)
Remove too much checking
author
sanemat <o.gata.ken@gmail.com>
Sat, 13 Oct 2012 06:43:52 +0000
(15:43 +0900)
committer
sanemat <o.gata.ken@gmail.com>
Sat, 13 Oct 2012 06:43:52 +0000
(15:43 +0900)
lib/compat/multi_json.rb
patch
|
blob
|
history
diff --git
a/lib/compat/multi_json.rb
b/lib/compat/multi_json.rb
index e62de7640ed159ee96271f10e94e5a436cccbee7..03ccf6dc9f257c145977c2b2510c47d9e7d345c5 100644
(file)
--- a/
lib/compat/multi_json.rb
+++ b/
lib/compat/multi_json.rb
@@
-2,7
+2,7
@@
gem 'multi_json', '>= 1.0.0'
require 'multi_json'
if !MultiJson.respond_to?(:load) || [
-
defined?(Kernel) &&
Kernel,
+ Kernel,
defined?(ActiveSupport::Dependencies::Loadable) && ActiveSupport::Dependencies::Loadable
].compact.include?(MultiJson.method(:load).owner)
module MultiJson