diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-08-19 14:29:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 14:29:59 +0900 |
| commit | 8a41e77506cf8bb99368d321f5723bf83d518588 (patch) | |
| tree | 1d1f23e4e5c4ec8b35ba8f1351d9e89e24a3d056 | |
| parent | a90e38158311e546701a5dd39c82fa56aeb9e980 (diff) | |
| parent | 842bc456c712df8a4ddd9d85a3d6182e79a23ab2 (diff) | |
| download | rails-8a41e77506cf8bb99368d321f5723bf83d518588.tar.gz rails-8a41e77506cf8bb99368d321f5723bf83d518588.tar.bz2 rails-8a41e77506cf8bb99368d321f5723bf83d518588.zip | |
Merge pull request #30322 from zokioki/fix_action_dispatch_typo
Fix typo in "Ambiguous route definition" error message
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 28809d7e67..57a5bc681e 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1851,7 +1851,7 @@ module ActionDispatch path_types.fetch(String, []).each do |_path| route_options = options.dup if _path && option_path - raise ArgumentError, "Ambiguous route definition. Both :path and the route path where specified as strings." + raise ArgumentError, "Ambiguous route definition. Both :path and the route path were specified as strings." end to = get_to_from_path(_path, to, route_options[:action]) decomposed_match(_path, controller, route_options, _path, to, via, formatted, anchor, options_constraints) |