diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-20 16:06:59 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-20 16:06:59 -0700 |
| commit | 089d9baa3348277c08a0877de785cb8fc14791aa (patch) | |
| tree | 57ec79192b0e6fc0a4c4564185bf8fc649475db5 /actionpack/lib | |
| parent | ba487b9bb0fc4fcb02fdf2644cb908cc38263c18 (diff) | |
| download | rails-089d9baa3348277c08a0877de785cb8fc14791aa.tar.gz rails-089d9baa3348277c08a0877de785cb8fc14791aa.tar.bz2 rails-089d9baa3348277c08a0877de785cb8fc14791aa.zip | |
we don't use this parameter for anything, so rm
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/formatter.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/journey/formatter.rb b/actionpack/lib/action_dispatch/journey/formatter.rb index 57f0963731..aa8d5a4d79 100644 --- a/actionpack/lib/action_dispatch/journey/formatter.rb +++ b/actionpack/lib/action_dispatch/journey/formatter.rb @@ -12,7 +12,7 @@ module ActionDispatch @cache = nil end - def generate(type, name, options, recall = {}, parameterize = nil) + def generate(name, options, recall = {}, parameterize = nil) constraints = recall.merge(options) missing_keys = [] diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 87dfa22207..01378ae0ec 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -600,7 +600,7 @@ module ActionDispatch # Generates a path from routes, returns [path, params]. # If no route is generated the formatter will raise ActionController::UrlGenerationError def generate - @set.formatter.generate(:path_info, named_route, options, recall, PARAMETERIZE) + @set.formatter.generate(named_route, options, recall, PARAMETERIZE) end def different_controller? |