diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-06-04 13:34:22 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 13:34:22 +0930 |
| commit | 04b15abd0a6d70fae3cf656975346611ade77ae6 (patch) | |
| tree | e9e32bdf42edebf087a39dc99b027c5f93c12e00 /actionpack | |
| parent | 387b775160988941a7d891a09ebe3ceaca1aed5e (diff) | |
| parent | 9f7c9ee44d9d433a089515e8d4b804a312693c8b (diff) | |
| download | rails-04b15abd0a6d70fae3cf656975346611ade77ae6.tar.gz rails-04b15abd0a6d70fae3cf656975346611ade77ae6.tar.bz2 rails-04b15abd0a6d70fae3cf656975346611ade77ae6.zip | |
Merge pull request #29348 from andrehjr/fix-typo-route-definition-ambiguous
Fix typo on error message when route definition is ambiguous.
Diffstat (limited to 'actionpack')
| -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 7459dd4ff3..88deee5f5e 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1837,7 +1837,7 @@ module ActionDispatch path_types.fetch(String, []).each do |_path| route_options = options.dup if _path && option_path - raise ArgumentError, "Ambigous route definition. Both :path and the route path where specified as strings." + raise ArgumentError, "Ambiguous route definition. Both :path and the route path where 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) |