diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:35:20 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-10 19:35:20 +0000 |
| commit | 582edaa1ffd6d875e18c50e36e144544209fd158 (patch) | |
| tree | ce4fb934973e1385ec64b78df6984e4a6267fc11 /railties/lib/rails | |
| parent | 2d3d9e3531d0d49a94ded10b993640053bd76c03 (diff) | |
| parent | 51a269b2282ec09cf58614e738a2d0e40d2909d3 (diff) | |
| download | rails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.gz rails-582edaa1ffd6d875e18c50e36e144544209fd158.tar.bz2 rails-582edaa1ffd6d875e18c50e36e144544209fd158.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'railties/lib/rails')
4 files changed, 6 insertions, 6 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 50bba22a3a..4fc23fe277 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -382,9 +382,9 @@ module Rails # Finds engine with given path def find(path) - path = path.to_s - Rails::Engine::Railties.engines.find { |r| - File.expand_path(r.root.to_s) == File.expand_path(path) + expanded_path = File.expand_path path.to_s + Rails::Engine::Railties.engines.find { |engine| + File.expand_path(engine.root.to_s) == expanded_path } end end diff --git a/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml index a747bfa698..179c14ca52 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/locales/en.yml @@ -1,5 +1,5 @@ # Sample localization file for English. Add more files in this directory for other locales. -# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. +# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. en: hello: "Hello world" diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb index 3e35d81a69..d50f536164 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb @@ -48,7 +48,7 @@ # You can have the root of your site routed with "root" # just remember to delete public/index.html. - # root :to => "welcome#index" + # root :to => 'welcome#index' # See how all your routes lay out with "rake routes" diff --git a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml index a30132bc99..6465a6a6e2 100644 --- a/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml +++ b/railties/lib/rails/generators/test_unit/model/templates/fixtures.yml @@ -1,4 +1,4 @@ -# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html +# Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html <% unless attributes.empty? -%> one: |