Tidying up some require : removing useless sort and homogenizing with…

… the rest of the code the wat the includes are done
rails · Mar 20, 2013 · 9c025ab · 9c025ab
1 parent acb78c2
commit 9c025ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
@@ -376,7 +376,4 @@ def run_validations! #:nodoc:
   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
@@ -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