diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-11 13:55:10 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-11 13:55:10 -0300 |
| commit | 7bb8fd2f641c3416522e647ed32a3142ccc1e01b (patch) | |
| tree | f32a83e4d4345558db39dab0cb46e9a692158b13 /activesupport | |
| parent | 4e9c0b7874b0c01891f79af9ca2dd110a0529c50 (diff) | |
| parent | 545afc150e4491a69d72d61864680b98dce5a7b7 (diff) | |
| download | rails-7bb8fd2f641c3416522e647ed32a3142ccc1e01b.tar.gz rails-7bb8fd2f641c3416522e647ed32a3142ccc1e01b.tar.bz2 rails-7bb8fd2f641c3416522e647ed32a3142ccc1e01b.zip | |
Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_default
Improve debugging support
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/kernel.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/kernel_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/kernel.rb b/activesupport/lib/active_support/core_ext/kernel.rb index aa19aed43b..293a3b2619 100644 --- a/activesupport/lib/active_support/core_ext/kernel.rb +++ b/activesupport/lib/active_support/core_ext/kernel.rb @@ -1,5 +1,5 @@ require 'active_support/core_ext/kernel/agnostics' require 'active_support/core_ext/kernel/concern' -require 'active_support/core_ext/kernel/debugger' +require 'active_support/core_ext/kernel/debugger' if RUBY_VERSION < '2.0.0' require 'active_support/core_ext/kernel/reporting' require 'active_support/core_ext/kernel/singleton_class' diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb index 18b251173f..d8bf81d02b 100644 --- a/activesupport/test/core_ext/kernel_test.rb +++ b/activesupport/test/core_ext/kernel_test.rb @@ -137,4 +137,4 @@ class KernelDebuggerTest < ActiveSupport::TestCase ensure Object.send(:remove_const, :Rails) end -end +end if RUBY_VERSION < '2.0.0' |