aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-05-20 03:51:37 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-05-20 03:51:37 -0300
commitd90ae764ec287e477dc5d679233dfc1efbe22828 (patch)
tree4c6a707c562ec546ba2a5aa0546ee8fc866c6b94
parentd6e7334d19c234d42904e4a70b5a76831731b114 (diff)
parentf58bd6ed22b0fea1cfe07eaf8b62940fcb104d7a (diff)
downloadrails-d90ae764ec287e477dc5d679233dfc1efbe22828.tar.gz
rails-d90ae764ec287e477dc5d679233dfc1efbe22828.tar.bz2
rails-d90ae764ec287e477dc5d679233dfc1efbe22828.zip
Merge pull request #25080 from maclover7/jm-add-oxford
Add back in Oxford Comma
-rw-r--r--actionpack/lib/action_dispatch/routing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index 64f8636c52..dd6ac9db9c 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -121,7 +121,7 @@ module ActionDispatch
# get 'blog/edit' => :edit
# end
#
- # # provides named routes for show, delete and edit
+ # # provides named routes for show, delete, and edit
# link_to @article.title, blog_show_path(id: @article.id)
#
# == Pretty URLs