diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-15 01:18:02 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:07 +0200 |
| commit | e9791bec823e42372eca095b946c93c1712a0613 (patch) | |
| tree | 8dc4f12b6c4646bdce775b58a8eca5721317b4d4 /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | 229a868264a1dd5f4441f4b82ccf2a51cf83511d (diff) | |
| download | rails-e9791bec823e42372eca095b946c93c1712a0613.tar.gz rails-e9791bec823e42372eca095b946c93c1712a0613.tar.bz2 rails-e9791bec823e42372eca095b946c93c1712a0613.zip | |
Routes refactoring:
* added more tests for prefix generation
* fixed bug with generating host for both prefix and url
* refactored url_for method
* organized tests for prefix generation
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index c94b00257b..b3945a4963 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -452,7 +452,7 @@ module ActionDispatch Generator.new(options, recall, self, extras).generate end - RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :port, :trailing_slash, :script_name, :routes] + RESERVED_OPTIONS = [:anchor, :params, :only_path, :host, :protocol, :port, :trailing_slash, :script_name] def _generate_prefix(options = {}) nil |