diff options
| author | Jon Moss <maclover7@users.noreply.github.com> | 2016-09-17 15:56:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 15:56:30 -0400 |
| commit | 7ccd32412e617884f21edb240df9030b8e3b58ea (patch) | |
| tree | 7cba066de186657ac86e9fff566a95ccd32df57a /railties | |
| parent | 34d2aed03bf7edde8791e8728805a7b7b0d41045 (diff) | |
| parent | e1252e073a6be072d82f0984332e851190323ef6 (diff) | |
| download | rails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.gz rails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.bz2 rails-7ccd32412e617884f21edb240df9030b8e3b58ea.zip | |
Merge pull request #26534 from Neodelf/new_branch_name
[ci skip] Fixed commas according to Oxford comma in rdoc and guides
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/engine.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/paths.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 86d66afddb..90e7c04d7c 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -337,7 +337,7 @@ module Rails # == Loading priority # # In order to change engine's priority you can use +config.railties_order+ in the main application. - # It will affect the priority of loading views, helpers, assets and all the other files + # It will affect the priority of loading views, helpers, assets, and all the other files # related to engine or application. # # # load Blog::Engine with highest priority, followed by application and other railties diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index 88ec2ba85b..1c1810dde6 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -30,7 +30,7 @@ module Rails # root["config/routes"].inspect # => ["config/routes.rb"] # # The +add+ method accepts the following options as arguments: - # eager_load, autoload, autoload_once and glob. + # eager_load, autoload, autoload_once, and glob. # # Finally, the +Path+ object also provides a few helpers: # |