Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-17 | 18 | -599/+959 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/flash.rb | ||||
| * | Allow custom controller for resource(s) [#3703 state:resolved] | Joshua Peek | 2010-01-16 | 1 | -1/+1 |
| | | |||||
| * | Split ActionDispatch http in smaller chunks. | José Valim | 2010-01-16 | 7 | -430/+480 |
| | | |||||
| * | Fix singleton resource named routes | Joshua Peek | 2010-01-15 | 1 | -2/+2 |
| | | |||||
| * | Fix const reference for SessionRestoreError | Joshua Peek | 2010-01-15 | 1 | -1/+1 |
| | | |||||
| * | Always join scoped paths with slashes | Joshua Peek | 2010-01-15 | 1 | -11/+17 |
| | | |||||
| * | Cleanup internal resource macro to use method helper shorthand | Joshua Peek | 2010-01-15 | 1 | -20/+14 |
| | | |||||
| * | Routing method shorthand shouldn't clobber :to options | Joshua Peek | 2010-01-15 | 1 | -2/+2 |
| | | |||||
| * | Move Flash into middleware | Joshua Peek | 2010-01-15 | 2 | -4/+174 |
| | | |||||
| * | Make HEAD method masquerade as GET so requests are routed correctly | Joshua Peek | 2010-01-15 | 2 | -5/+25 |
| | | |||||
| * | Ensure log is flushed and tailed on failures. | José Valim | 2010-01-15 | 1 | -4/+3 |
| | | |||||
| * | Move Dispatcher setup to Railties and add instrumentation hook. | José Valim | 2010-01-15 | 1 | -7/+10 |
| | | |||||
| * | Respect resources_path_names and :path_names options in new dsl | Joshua Peek | 2010-01-13 | 2 | -44/+96 |
| | | |||||
| * | Ensure optional path scopes are properly handled. | José Valim | 2010-01-14 | 1 | -8/+12 |
| | | |||||
| * | Add router support for resources :only and :except actions | Joshua Peek | 2010-01-13 | 1 | -16/+38 |
| | | |||||
| * | Pass :as to resources to change the resource name | Joshua Peek | 2010-01-13 | 1 | -4/+5 |
| | | |||||
| * | Passing in a crud action overloads the default action instead of creating a | Joshua Peek | 2010-01-13 | 1 | -2/+9 |
| | | | | | | | | new member action. | ||||
| * | Ensure nested namespaces work as expected. | José Valim | 2010-01-10 | 1 | -7/+4 |
| | | |||||
| * | Fixes namespaced routes [#3673 status:resolved] | Joao Carlos | 2010-01-10 | 1 | -2/+10 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Ensure that segments in default_url_options also work with format specified. | José Valim | 2010-01-07 | 1 | -2/+2 |
| | | |||||
| * | From now on, parameters defined in default_url_options can be absent from ↵ | José Valim | 2010-01-07 | 1 | -21/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | named routes. This allows the following setup to work: # app/controllers/application_controller.rb class ApplicationController def default_url_options(options=nil) { :locale => I18n.locale } end end # From your views and controllers: I18n.locale #=> :en users_url #=> "/en/users" users_url(:pl) #=> "/pl/users" user_url(1) #=> "/en/users/1" user_url(:pl, 1) #=> "/pl/users/1" user_url(1, :locale => :pl) #=> "/pl/users/1" If you provide all expected parameters, it still works as previously. But if any parameter is missing, it tries to assign all possible ones with the hash returned in default_url_options or the one passed straight to the named route method. Beware that default_url_options in ApplicationController is not shared with ActionMailer, so you are required to always give the locale in your email views. | ||||
| * | namespace in routes changes both the path and name prefix. | José Valim | 2010-01-06 | 1 | -1/+1 |
| | | |||||
| * | Allow named routes to be debugged. | José Valim | 2010-01-06 | 1 | -23/+20 |
| | | |||||
| * | Ruby 1.9.1 requires hash given to foormat to contain symbols. | José Valim | 2010-01-06 | 1 | -1/+1 |
| | | |||||
| * | Remove CGI.escape in function of Rack::Mount.escape | José Valim | 2010-01-06 | 1 | -1/+1 |
| | | |||||
| * | redirect in routes takes port into account [#3653 status:resolved] | José Valim | 2010-01-05 | 1 | -0/+1 |
| | | |||||
| * | All router redirect helper to accept a full URI [#3653 state:resolved] | Joshua Peek | 2010-01-05 | 1 | -5/+13 |
| | | |||||
| * | assert_template depends on AV::Template monkey patches in action_view/test_case | Joshua Peek | 2010-01-05 | 1 | -0/+9 |
| | | |||||
| * | Trash string coercion rack hacks | Joshua Peek | 2010-01-04 | 1 | -29/+0 |
| | | |||||
| * | Autoload AS test case | Joshua Peek | 2010-01-04 | 1 | -1/+0 |
| | | |||||
| * | @_formats initialization should be AbstractController::Base. | José Valim | 2010-01-04 | 1 | -1/+1 |
| | | |||||
| * | Remove deprecated formatted named routes | José Valim | 2010-01-04 | 1 | -8/+0 |
| | | |||||
| * | Add notifications to ActionDispatch::ShowExceptions, this can be used as ↵ | José Valim | 2010-01-03 | 1 | -2/+22 |
| | | | | | | | | hooks for plugins like ExceptionNotifier. | ||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-04 | 25 | -655/+764 |
|\| | |||||
| * | fixed missing or incorrect session data error message | Stefan Penner | 2010-01-02 | 1 | -1/+1 |
| | | |||||
| * | Make sure evalled method knows where it came from | Yehuda Katz | 2009-12-29 | 1 | -2/+2 |
| | | |||||
| * | Complain if there's no such middleware | Jeremy Kemper | 2009-12-28 | 1 | -2/+3 |
| | | |||||
| * | Silence some trivial warnings: shadowed local vars, indentation mismatches | Jeremy Kemper | 2009-12-28 | 2 | -8/+8 |
| | | |||||
| * | Ruby 1.9: string is not enumerable, so #exclude? is not available | Jeremy Kemper | 2009-12-27 | 1 | -5/+3 |
| | | |||||
| * | Typo | Jeremy Kemper | 2009-12-27 | 1 | -1/+1 |
| | | |||||
| * | Require the enumberable extension from active support because we use #exclude? | David Heinemeier Hansson | 2009-12-27 | 1 | -0/+2 |
| | | |||||
| * | Added shorthand for match 'products/overview' that expands to match ↵ | David Heinemeier Hansson | 2009-12-27 | 1 | -1/+15 |
| | | | | | | | | 'products/overview', :to => 'products#overview', :as => 'products_overview' | ||||
| * | AD::Cascade that supports X-Cascade | Joshua Peek | 2009-12-26 | 1 | -0/+29 |
| | | |||||
| * | rack-mount 0.4 | Joshua Peek | 2009-12-26 | 2 | -20/+20 |
| | | |||||
| * | The controller key shouldnt be part of the mapping if its not used | David Heinemeier Hansson | 2009-12-25 | 1 | -2/+2 |
| | | |||||
| * | Merge | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Allow named_routes to be used with root, and with new DSL short-form. | Sam Ruby | 2009-12-23 | 1 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The real use case it to make all of the following act the same: root 'store#index', :as => 'store' match '/' => 'store#index', :as => 'store' match '/', :to => 'store#index', :as => 'store' The test case provided deviates from this in order to demonstrate all three forms in a single set of test routes. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵ | Jeremy Kemper | 2009-12-23 | 1 | -2/+4 |
| | | | | | | | | | | | | :as option is given to root method since its name is always 'root' | ||||
| | * | Shift more responsibility from application class to its singleton instance. ↵ | Jeremy Kemper | 2009-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration. | ||||
| * | | Extract Mapping class from monster match method | David Heinemeier Hansson | 2009-12-24 | 1 | -90/+137 |
| |/ |