Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'docrails/master' | Xavier Noria | 2010-04-04 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Andrew White | 2010-04-04 | 4 | -30/+32 |
| |\ | |||||
| * | | Update various documentation examples to use new routing DSL | Andrew White | 2010-04-04 | 1 | -1/+1 |
| | | | |||||
* | | | Reapply redirect {|params, request| } with passing tests this time | wycats | 2010-04-04 | 1 | -1/+5 |
| | | | |||||
* | | | Revert "Pass in the request as an optional second parameter to redirect" | Jeremy Kemper | 2010-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Was not tested. This reverts commit a8c3c71af161e7d4263ad489ca2f6601bc02a9bb. | ||||
* | | | Fix signed cookies by explicitly passing config to the cookie jar | Jeremy Kemper | 2010-04-04 | 1 | -23/+19 |
| | | | |||||
* | | | Pass in the request as an optional second parameter to redirect | wycats | 2010-04-03 | 1 | -1/+1 |
| | | | |||||
* | | | * Change the object used in routing constraints to be an instance of | wycats | 2010-04-03 | 4 | -31/+55 |
| |/ |/| | | | | | | | | | | | | | | | | | | | ActionDispatch::Request rather than Rack::Request. * Changed ActionDispatch::Request#method to return a String, to be compatible with the Rack::Request superclass. * Changed ActionDispatch::Request#method to return the original method in the case of methodoverride and #request_method not to, to be compatible with Rack::Request | ||||
* | | Merge commit 'rails/master' | Xavier Noria | 2010-04-03 | 3 | -28/+30 |
|\ \ | |||||
| * | | Add a test which ensures action_dispatch.show_exceptions is properly disabled. | José Valim | 2010-04-02 | 2 | -4/+2 |
| | | | |||||
| * | | Raise exceptions instead of rendering error templates in test environment ↵ | Rolf Bjaanes | 2010-04-02 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | [#4315 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Maintain the usage of :as consistent in the router. Whenever it's supplied, ↵ | José Valim | 2010-04-02 | 1 | -25/+28 |
| | | | | | | | | | | | | it changes the NAMED ROUTE. If you want to change the PATH, use :path instead. Example: resources :projects, :path => 'projetos' | ||||
* | | | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-04-02 | 1 | -2/+2 |
|\| | | |/ |/| | |||||
| * | Slightly less annoying check for acceptable mime_types. This allows Accept: ↵ | Paul Sadauskas | 2010-04-01 | 1 | -2/+2 |
| | | | | | | | | application/json, application/jsonp (and the like), but still blacklists browsers. Essentially, we use normal content negotiation unless you include */* in your list, in which case we assume you're a browser and send HTML [#3541 state:resolved] | ||||
* | | Merge commit 'rails/master' | Xavier Noria | 2010-03-31 | 16 | -36/+96 |
|\| | |||||
| * | Deprecate cookie_verifier_secret in favor of config.cookie_secret allowing ↵ | José Valim | 2010-03-31 | 1 | -3/+3 |
| | | | | | | | | signed cookies to work again. | ||||
| * | Consistent routing language | Joshua Peek | 2010-03-30 | 1 | -10/+10 |
| | | |||||
| * | Fix stack overflow bug in integration test router helpers | Joshua Peek | 2010-03-30 | 1 | -1/+1 |
| | | |||||
| * | Add more tests and docs to uncountable routes. [#3930 state:resolved] | Rizwan Reza | 2010-03-28 | 1 | -1/+2 |
| | | |||||
| * | Add _index to named collection routes for uncountable resources (e.g. Sheep) | Jan De Poorter | 2010-03-28 | 1 | -1/+5 |
| | | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
| * | Request#content_type exists in Rack::Request, and other parts of ↵ | wycats | 2010-03-28 | 3 | -7/+13 |
| | | | | | | | | | | | | Rack::Request expect it to return a String. Split the Rails API so that Request#content_type returns a String, and Request#content_mime_type returns a Mime::Type object. | ||||
| * | Add constraints to resources in new routing DSL | Andrew White | 2010-03-28 | 1 | -14/+47 |
| | | | | | | | | Signed-off-by: Rizwan Reza <rizwanreza@gmail.com> | ||||
| * | Merge remote branch 'rizwan/restrict' | wycats | 2010-03-28 | 10 | -0/+14 |
| |\ | |||||
| | * | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 9 | -0/+13 |
| | | | |||||
| | * | adds missing requires for Object#duplicable? | Xavier Noria | 2010-03-28 | 1 | -0/+1 |
| | | | |||||
| * | | Rails 3 application can run performance tests now. [#4171 state:resolved] | Rizwan Reza | 2010-03-28 | 1 | -1/+3 |
| |/ | |||||
* | | ActionController::Resources has gone away | Andrew White | 2010-03-31 | 1 | -2/+1 |
| | | |||||
* | | Remove routing implementation details from RDoc | Andrew White | 2010-03-31 | 3 | -12/+12 |
| | | |||||
* | | Update routing documentation to the new way of specifying HTTP method ↵ | Andrew White | 2010-03-31 | 1 | -9/+21 |
| | | | | | | | | restrictions | ||||
* | | Mark ActionDispatch::Routing::DeprecatedMapper as nodoc to hide old ↵ | Andrew White | 2010-03-31 | 1 | -1/+1 |
|/ | | | | documentation until it's removed | ||||
* | Fix a mistake in the documentation (ht: Evgeniy Dolzhenko) [#4217 ↵ | wycats | 2010-03-27 | 1 | -1/+1 |
| | | | | state:resolved] | ||||
* | Fix named routes for member actions of singleton resources [#4266 ↵ | Andrew White | 2010-03-27 | 1 | -1/+1 |
| | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Add parameter defaults support to new routing DSL [#4265 state:resolved] | Andrew White | 2010-03-27 | 1 | -1/+19 |
| | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Make X-Sendfile default to "" so it works correctly in dev mode. | wycats | 2010-03-26 | 1 | -1/+1 |
| | | | | | Provide a default in production.rb that can be modified, so that people who care about sendfile performance in production mode can get better performance easily. | ||||
* | Merge branch 'master' into docrails | wycats | 2010-03-26 | 10 | -116/+66 |
|\ | |||||
| * | Move application configuration to the application configuration object, ↵ | José Valim | 2010-03-26 | 1 | -2/+1 |
| | | | | | | | | remove railtie_name and engine_name and allow to set the configuration object. | ||||
| * | Rails router automatically calculated for you the controller and named ↵ | José Valim | 2010-03-26 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | routes in the following scenarios: match "home/about" #=> maps to home#about with named route home_about_path match "about" #=> does not work because it cannot guess the controller match "about" => "home#about" #=> maps to home#about with named route home_about_path match "home/about", :as => "about" #=> maps to home#about with named route about_path | ||||
| * | Protect routes again so they don't end up as actions. We need a better ↵ | wycats | 2010-03-23 | 1 | -0/+1 |
| | | | | | | | | solution than this. | ||||
| * | open_session can just return the a dup of the current context. | wycats | 2010-03-22 | 1 | -24/+3 |
| | | | | | | | | | | At this point, its entire purpose in the open_session {} case was to delegate back to the IntegrationTest anyway. | ||||
| * | Make router shortcuts more polite to URLs starting with a leading slash. | José Valim | 2010-03-22 | 1 | -15/+17 |
| | | |||||
| * | Clean up Mime::Type and remove deprecated stuff (from 2.3). | José Valim | 2010-03-20 | 1 | -7/+1 |
| | | |||||
| * | We seem to have removed the URL helpers from ActionView subclasses... | wycats | 2010-03-18 | 1 | -0/+1 |
| | | |||||
| * | Each controller class has it's own view context subclass. This removes the ↵ | Carlhuda | 2010-03-18 | 1 | -3/+4 |
| | | | | | | | | need for ActionView::Base.for_controller | ||||
| * | All tests pass without memoizing view_context | Carlhuda | 2010-03-18 | 1 | -3/+2 |
| | | |||||
| * | Deleting and setting a cookie in the same request was broken | Mathias Biilmann Christensen | 2010-03-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Made sure to remove a cookie from @deleted_cookies when set [#4211 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Get modules back into integration tests | Carlhuda | 2010-03-17 | 1 | -0/+3 |
| | | |||||
| * | Fix for missing dependency in ActionDispatch::Integration | Mathias Biilmann Christensen | 2010-03-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | When running cucumber features from a new rails 3 app requiring 'cucumber/rails/world' would raise: uninitialized constant ActionDispatch::Integration::Session::Test (NameError) Fixed by requiring 'test/unit/assertions' in action_dispatch/integration Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Modify assert_template to use instrumentation | Carlhuda | 2010-03-17 | 1 | -52/+0 |
| | | |||||
| * | Install url helpers on module instance so they can be accessed | Joshua Peek | 2010-03-17 | 1 | -5/+13 |
| | | | | | | | | globally | ||||
| * | Eliminate warnings for AM on 1.8 | wycats | 2010-03-16 | 1 | -1/+0 |
| | |