diff options
| author | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
|---|---|---|
| committer | Pablo Ifran <pabloifran@gmail.com> | 2012-10-22 09:42:42 -0200 |
| commit | e041a50f2917f82950f9e5666f966d8992afd45d (patch) | |
| tree | 9f4d2e3aa88f28dba9d7a1d24d46977e0642a1eb /activesupport/lib/active_support/testing/performance/ruby.rb | |
| parent | 3e6b2f5d38e0f31db3fb0fcd3bbab92666a0e3e2 (diff) | |
| parent | ae27acb342c575ce19d5ad78cb13ba23f826fab1 (diff) | |
| download | rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.gz rails-e041a50f2917f82950f9e5666f966d8992afd45d.tar.bz2 rails-e041a50f2917f82950f9e5666f966d8992afd45d.zip | |
Merge branch 'master' of https://github.com/lifo/docrails
Conflicts:
activerecord/lib/active_record/callbacks.rb
Diffstat (limited to 'activesupport/lib/active_support/testing/performance/ruby.rb')
| -rw-r--r-- | activesupport/lib/active_support/testing/performance/ruby.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb index 12aef0d7fe..7c149df1e4 100644 --- a/activesupport/lib/active_support/testing/performance/ruby.rb +++ b/activesupport/lib/active_support/testing/performance/ruby.rb @@ -2,7 +2,7 @@ begin require 'ruby-prof' rescue LoadError $stderr.puts 'Specify ruby-prof as application\'s dependency in Gemfile to run benchmarks.' - exit + raise end module ActiveSupport |