aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-07-11 16:09:46 -0700
committerJoshua Peek <josh@joshpeek.com>2011-07-11 16:09:46 -0700
commit5c8be9eb864886d7ba9abba0d59786614cca2a5a (patch)
tree201041f2d09392bfa198adac1ec06da54eb6f1b3
parenteeb58b0934f646847b3220e3db270bc6b9148919 (diff)
downloadrails-5c8be9eb864886d7ba9abba0d59786614cca2a5a.tar.gz
rails-5c8be9eb864886d7ba9abba0d59786614cca2a5a.tar.bz2
rails-5c8be9eb864886d7ba9abba0d59786614cca2a5a.zip
Ensure Dir.glob is sorted
-rw-r--r--railties/lib/rails/paths.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 09ff0ef378..3f1d2ca87d 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -157,7 +157,7 @@ module Rails
path = File.expand_path(p, @root.path)
if @glob
- result.concat Dir[File.join(path, @glob)]
+ result.concat Dir[File.join(path, @glob)].sort
else
result << path
end