Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-06-01 | 8 | -60/+56 |
|\ | |||||
| * | AS::Concern redefines "include" to lazy include modules as dependencies | Joshua Peek | 2009-05-29 | 5 | -8/+6 |
| | | |||||
| * | AS::Concern includes InstanceMethods module if it exists | Joshua Peek | 2009-05-29 | 1 | -6/+1 |
| | | |||||
| * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵ | Joshua Peek | 2009-05-28 | 6 | -6/+6 |
| | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. | ||||
| * | The FlashHash and friends causes a lot of needless session storing, when we ↵ | Johan Sörensen | 2009-05-28 | 1 | -33/+37 |
| | | | | | | | | | | | | know for a fact that there's no content in the flash. By not storing the empty hash in the session we save a lot of communication with the various session backends, while still keeping the same interface to the flash. [#2703 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Memoize cookies so that updates to cookies are available in the current ↵ | Olly Legg | 2009-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | request. [#2733 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | ActionController::Flash::FlashHash.use now returns either the value ↵ | Niels Ganser | 2009-05-27 | 1 | -6/+5 |
| | | | | | | | | | | | | corresponding to the passed key or itself when no key is passed [#1792 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-24 | 11 | -230/+302 |
|\| | | | | | | | | | Conflicts: actionpack/lib/action_controller/base/mime_responds.rb | ||||
| * | Remove unnecessary asset_host initialization | Pratik Naik | 2009-05-23 | 1 | -1/+0 |
| | | |||||
| * | Make logging_test pass with the new base | Pratik Naik | 2009-05-23 | 1 | -1/+1 |
| | | |||||
| * | Add all the existing helpers related features to the new base | Pratik Naik | 2009-05-23 | 1 | -13/+9 |
| | | |||||
| * | Move FilterParameterLogging to a stand alone module and make it work on new base | Pratik Naik | 2009-05-22 | 2 | -57/+98 |
| | | |||||
| * | Add missing dependency in Streaming | Pratik Naik | 2009-05-22 | 1 | -0/+7 |
| | | |||||
| * | Remove some response content type concepts from ActionView | Yehuda Katz + Carl Lerche | 2009-05-21 | 1 | -4/+3 |
| | | |||||
| * | Add Streaming to new base | Pratik Naik | 2009-05-21 | 1 | -0/+1 |
| | | |||||
| * | RequestForgeryProtection now works with the new base | Pratik Naik | 2009-05-21 | 1 | -5/+19 |
| | | |||||
| * | Allow Module#depends_on to accept multiple modules | Pratik Naik | 2009-05-21 | 1 | -4/+1 |
| | | |||||
| * | Made ActionController::Verification work with new_base | Pratik Naik | 2009-05-21 | 1 | -3/+9 |
| | | |||||
| * | Make ActionController::Flash work with new_base | Pratik Naik | 2009-05-21 | 1 | -22/+52 |
| | | |||||
| * | Added responds_to to new base. | Yehuda Katz + Carl Lerche | 2009-05-20 | 1 | -108/+107 |
| | | |||||
| * | Ported simple benchmarking in new base | Yehuda Katz + Carl Lerche | 2009-05-18 | 1 | -1/+1 |
| | | |||||
| * | Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] ↵ | Pratik Naik | 2009-05-18 | 1 | -1/+2 |
| | | | | | | | | [Steve Madsen] | ||||
| * | Rescue hack was supposed to be removed. Some how it crept back in. | Joshua Peek | 2009-05-17 | 1 | -3/+2 |
| | | |||||
| * | Simplify filter_chain method implementation [#2327 state:resolved] | Thomas E. Glasgow | 2009-05-17 | 1 | -6/+1 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-16 | 1 | -1/+1 |
|\| | |||||
| * | Ported Rescuable to new base | Yehuda Katz + Carl Lerche | 2009-05-15 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-05-15 | 7 | -31/+89 |
|\| | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb | ||||
| * | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 4 | -3/+11 |
| | | |||||
| * | Implemented redirects and partial rendering in new base. | Yehuda Katz + Carl Lerche | 2009-05-12 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 3 | -16/+67 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb | ||||
| | * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 2 | -7/+52 |
| | | | | | | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public. | ||||
| | * | Deprecate Controller.process interface | Joshua Peek | 2009-05-02 | 1 | -0/+1 |
| | | | |||||
| | * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 1 | -4/+8 |
| | | | |||||
| | * | Deprecate assert_redirect_to's partial hash matching | Joshua Peek | 2009-05-02 | 2 | -5/+0 |
| | | | |||||
| * | | Implement FooController.action(:name) | Yehuda Katz | 2009-05-02 | 1 | -16/+11 |
| |/ | | | | | | | | | | | * Rails actions are now Rack endpoints, and can be retrieved via FooController.action(name) and called with an env * Updated some tests that relied on the old internal #process/#call implementation | ||||
| * | Fix render :json => nil [#2589 state:resolved] | Jeremy Kemper | 2009-04-30 | 1 | -1/+2 |
| | | |||||
| * | Start moving TestRequest and TestResponse into ActionDispatch | Joshua Peek | 2009-04-30 | 1 | -1/+2 |
| | | |||||
* | | Some spelling changes. | Evan Farrar | 2009-05-07 | 2 | -2/+2 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-30 | 3 | -26/+29 |
|\| | |||||
| * | Deprecate template, session, assigns, and layout accessors on response ↵ | Joshua Peek | 2009-04-28 | 2 | -2/+4 |
| | | | | | | | | object. Instead access them through the controller instance. This mainly affects functional test assertions. | ||||
| * | Refactor ActionView::Template | Yehuda Katz + Carl Lerche | 2009-04-27 | 2 | -8/+19 |
| | | | | | | | | | | | | | | | | ActionView::Template is now completely independent from template storage, which allows different back ends such as the database. ActionView::Template's only responsibility is to take in the template source (passed in from ActionView::Path), compile it, and render it. | ||||
| * | Delegate controller.session to request.session and deprecate response session | Joshua Peek | 2009-04-27 | 1 | -9/+5 |
| | | |||||
| * | Check for to_str rather than String | Jeremy Kemper | 2009-04-26 | 1 | -1/+1 |
| | | |||||
| * | Inherit TestSession from Session::AbstractStore and add indifferent access ↵ | Joshua Peek | 2009-04-26 | 1 | -8/+2 |
| | | | | | | | | to Session::AbstractStore. | ||||
* | | Removed reference in documentation of form_authenticity_token to deprecated ↵ | Luke Amdor | 2009-04-27 | 1 | -2/+1 |
| | | | | | | | | :secret option of protect_from_forgery | ||||
* | | Add documentation for respond_to's any method | Ryan Bigg | 2009-04-27 | 1 | -0/+12 |
|/ | |||||
* | * Add pluggable JSON backends with support for the JSON gem. [rick] | rick | 2009-04-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end | ||||
* | Refactor ActionView::Path | Yehuda Katz + Carl Lerche | 2009-04-22 | 2 | -2/+7 |
| | | | | | | | | * Decouple from ActionController and ActionMailer * Bring back localization support. * Prepare to decouple templates from the filesystem. * Prepare to decouple localization from ActionView * Fix ActionMailer to take advantage of ActionView::Path | ||||
* | Rack::Utils.body_to_s doesn't exist in 1.0 | Jeremy Kemper | 2009-04-22 | 1 | -1/+3 |
| | |||||
* | Reinstate Base#render_to_string. Introduce ↵ | Jeremy Kemper | 2009-04-21 | 1 | -5/+9 |
| | | | | AbstractController#render_to_string which stringifies render_to_body. |