diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-12 10:40:04 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-12 10:40:04 +0100 |
| commit | f709682697dd1654e4251e7c3db30e054910cccb (patch) | |
| tree | 546ec8ed73639ae0a1919a12464f0ff341704ed3 /actionpack | |
| parent | 8925e37fdcc37f4ff2ab2d55168719bbe9386ebf (diff) | |
| parent | ef2a8c23911c35272da139a47e05a15ebf292334 (diff) | |
| download | rails-f709682697dd1654e4251e7c3db30e054910cccb.tar.gz rails-f709682697dd1654e4251e7c3db30e054910cccb.tar.bz2 rails-f709682697dd1654e4251e7c3db30e054910cccb.zip | |
Merge pull request #23612 from vipulnsward/23561-fix-routes-args
Fix argument passing to rake routes
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing.rb | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index bf964d06e9..921aff300f 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -42,8 +42,7 @@ ## Rails 5.0.0.beta2 (February 01, 2016) ## -* Add `-g` and `-c` (short for _grep_ and _controller_ respectively) options - to `bin/rake routes`. These options return the url `name`, `verb` and +* Add `-g` and `-c` options to `bin/rake routes`. These options return the url `name`, `verb` and `path` field that match the pattern or match a specific controller. Deprecate `CONTROLLER` env variable in `bin/rake routes`. diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb index 6cde5b2900..79f9283f83 100644 --- a/actionpack/lib/action_dispatch/routing.rb +++ b/actionpack/lib/action_dispatch/routing.rb @@ -239,8 +239,7 @@ module ActionDispatch # # rails routes # - # Target specific controllers by prefixing the command with <tt>--controller</tt> option - # - or its <tt>-c</tt> shorthand. + # Target specific controllers by prefixing the command with <tt>-c</tt> option. # module Routing extend ActiveSupport::Autoload |