diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-21 05:37:48 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-21 05:37:48 -0700 |
| commit | 34d9aed32ed785148bcb97b027b9a90ee2850603 (patch) | |
| tree | a669add8ccf3f1639a29a0c0c3e502920f697030 | |
| parent | b1b9de3d967eef113246666c28a403f3fb75ea68 (diff) | |
| parent | 9c025ab6e9731dde56186b41ba5d4f216a48c831 (diff) | |
| download | rails-34d9aed32ed785148bcb97b027b9a90ee2850603.tar.gz rails-34d9aed32ed785148bcb97b027b9a90ee2850603.tar.bz2 rails-34d9aed32ed785148bcb97b027b9a90ee2850603.zip | |
Merge pull request #9836 from Intrepidd/tidy-require
Tidying up some require and removing overhead caused by sorting
| -rw-r--r-- | activemodel/lib/active_model/validations.rb | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext.rb | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index 72e3cf310a..714cc95b9a 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -376,7 +376,4 @@ module ActiveModel end end -Dir[File.dirname(__FILE__) + "/validations/*.rb"].sort.each do |path| - filename = File.basename(path) - require "active_model/validations/#{filename}" -end +Dir[File.dirname(__FILE__) + "/validations/*.rb"].each { |file| require file } diff --git a/activesupport/lib/active_support/core_ext.rb b/activesupport/lib/active_support/core_ext.rb index b48bdf08e8..998a59c618 100644 --- a/activesupport/lib/active_support/core_ext.rb +++ b/activesupport/lib/active_support/core_ext.rb @@ -1,4 +1,4 @@ -Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path| +Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].each do |path| next if File.basename(path, '.rb') == 'logger' - require "active_support/core_ext/#{File.basename(path, '.rb')}" + require path end |