diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-22 13:01:53 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-22 13:01:53 -0700 |
| commit | 9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0 (patch) | |
| tree | 24dcf69c35ba59e499d4e6e07b4618719599aaf8 /railties/lib | |
| parent | a6e05b18d65d07a157ee09d54167c81f3d1440f8 (diff) | |
| parent | c0dd0cee46ac2d0864dc8bbdac1fe526f9cec346 (diff) | |
| download | rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.tar.gz rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.tar.bz2 rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.zip | |
Merge branch 'master' into i18n
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/documentation.rake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 70c6a629ec..ee847e5561 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -356,7 +356,7 @@ Run `rake gems:install` to install the missing gems. if configuration.cache_classes configuration.eager_load_paths.each do |load_path| matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/ - Dir.glob("#{load_path}/**/*.rb").each do |file| + Dir.glob("#{load_path}/**/*.rb").sort.each do |file| require_dependency file.sub(matcher, '\1') end end diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/tasks/documentation.rake index 331b2450a3..f4927a0ef1 100644 --- a/railties/lib/tasks/documentation.rake +++ b/railties/lib/tasks/documentation.rake @@ -62,6 +62,7 @@ namespace :doc do options << "-o doc/plugins/#{plugin}" options << "--title '#{plugin.titlecase} Plugin Documentation'" options << '--line-numbers' << '--inline-source' + options << '--charset' << 'utf-8' options << '-T html' files.include("#{plugin_base}/lib/**/*.rb") |