aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* We dont need to merge in the parameters as thats all being reset by the rack ...David Heinemeier Hansson2012-03-201-1/+0
* respond_with description: changed 'response' to 'format'Mark Thomson2012-03-181-1/+1
* Revised comments for respond_withMark Thomson2012-03-181-17/+18
* Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-1712-56/+86
|\
| * fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
| * strip null bytes from Location header as wellBrian Lopez2012-03-151-1/+1
| * Simplify helpers handling. Ensure Metal can run AC hooks.José Valim2012-03-154-35/+34
| * Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-151-5/+0
| * Remove --http.José Valim2012-03-141-134/+0
| * Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignoredPiotr Sarnacki2012-03-141-1/+1
| |\
| | * Don't ignore call to undefined method in SweeperLevente Bagi2012-03-061-1/+1
| * | Add ActionController::HTTPSantiago Pastorino2012-03-145-6/+146
| * | Remove Active Resource source files from the repositoryPrem Sichanugrist2012-03-131-2/+2
| * | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-131-1/+24
| |\ \
| * | | 'module' is reserved word. Sample of code with error - not cool.Egor Homakov2012-03-131-2/+2
| * | | Updated description of #retrieve_collector_from_mimesMark Thomson2012-03-131-2/+6
| * | | Merge pull request #5375 from nertzy/assert_template_with_regexpAaron Patterson2012-03-121-2/+7
| |\ \ \
| | * | | assert_template matches against RegexpGrant Hutchins2012-03-101-2/+7
| * | | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-101-2/+18
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | configure how unverified request will be handledSergey Nartimov2012-03-091-2/+18
* | | | | Revised description for responds_withMark Thomson2012-03-171-19/+115
| |_|/ / |/| | |
* | | | Added documentation for the ActionController::MimeResponds::Collector class.Mark Thomson2012-03-131-1/+24
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-091-0/+10
|\ \ \ | |/ / |/| |
| * | copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| * | Add some docs for ActionController::Base.without_modulesCarlos Antonio da Silva2012-03-061-0/+10
* | | Set the rendered_format on respond_to.José Valim2012-03-071-0/+1
* | | Remove unused ActionController::SessionManagementSantiago Pastorino2012-03-062-10/+0
* | | Avoid ImplicitRender just call render directlySantiago Pastorino2012-03-061-3/+1
* | | Clean up module docs [ci skip]Vijay Dev2012-03-071-21/+21
| |/ |/|
* | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
* | force response body to be read in assert_templateSergey Nartimov2012-03-051-0/+4
* | remove usages of AS::OrderedHashVishnu Atrai2012-03-031-1/+1
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-031-1/+1
|\
| * Removed max-stale from the setting the cache-headers in the response as max-s...Anuj Dutta2012-03-021-1/+1
* | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-11/+12
* | Optimize path helpers.José Valim2012-03-021-16/+14
* | fix api doc [ci skip]Vijay Dev2012-03-011-1/+1
* | adds a nodoc [ci skip]Vijay Dev2012-03-011-1/+1
|/
* Document the :host option for force_sslAndrew White2012-02-231-0/+1
* Update documentation for force_ssl - closes #5023.Andrew White2012-02-231-1/+14
* SSL should not be disabled by default in any environment.Pat Allan2012-02-231-1/+1
* Merge pull request #5130 from dlee/revised_patch_verbXavier Noria2012-02-223-9/+15
|\
| * Add config.default_method_for_update to support PATCHDavid Lee2012-02-223-9/+15
* | format lookup for partials is derived from the format in which the template i...Santiago Pastorino2012-02-222-2/+2
|/
* search private / protected methods in trunk rubyAaron Patterson2012-02-201-1/+1
* Merge pull request #3479 from arvida/ensure-date-header-on-expires-inJosé Valim2012-02-181-0/+3
|\
| * Ensuring a HTTP Date header when setting Cache-Control's max-age with #expire...arvida2011-10-311-0/+3
* | let expires_in accept a must_revalidate flagXavier Noria2012-02-171-2/+6
* | Rack body respond to each and not to joinSantiago Pastorino2012-02-141-2/+4
* | Fixed force_ssl redirects to include original query paramsRyan McGeary2012-02-071-0/+1