aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-191-19/+116
|\
| * 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-1737-637/+163
| |\
| * | Revised description for responds_withMark Thomson2012-03-171-19/+115
| | |
* | | time_tag support for blocksAntonio Tapiador del Dujo2012-03-181-2/+7
| | |
* | | Whitespaces :scissors:Rafael Mendonça França2012-03-171-1/+1
| | |
* | | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.xRafael Mendonça França2012-03-171-23/+13
| | |
* | | Rack::SSL -> ActionDispatch::SSLRafael Mendonça França2012-03-172-0/+88
| |/ |/|
* | Add missing requireSantiago Pastorino2012-03-171-0/+1
| |
* | Remove unused requireSantiago Pastorino2012-03-171-1/+0
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-171-4/+4
|\ \ | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| * | Minor clarification in documentation language and spellingMatthew Daubert2012-03-131-4/+4
| | |
* | | Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-171-0/+1
| | | | | | | | | | | | Fix for #5440
* | | fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
| | |
* | | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgsPiotr Sarnacki2012-03-161-2/+2
|\ \ \ | | | | | | | | Fix exceptions messages in AC layouts
| * | | Fix exceptions messages in AC layoutsAlexey Vakhov2012-03-101-2/+2
| | | |
* | | | Merge pull request #5454 from luke-gru/luke-devPiotr Sarnacki2012-03-151-4/+11
|\ \ \ \ | | | | | | | | | | allow zero-arity proc for AbstrController::layout
| * | | | allow zero-arity proc for AbstrController::layoutLuke Gruber2012-03-151-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | proc without parameters can now be given to AbstractController::layout
* | | | | strip null bytes from Location header as wellBrian Lopez2012-03-152-2/+2
|/ / / / | | | | | | | | | | | | add tests for stripping \r\n chars since that's already happening
* | | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequenceAaron Patterson2012-03-151-0/+1
|\ \ \ \ | | | | | | | | | | fix ArgumentError being raised in case of invalid byte sequences
| * | | | fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-081-0/+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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
* | | | | Allow you to force the authenticity_token to be rendered even on remote ↵David Heinemeier Hansson2012-03-141-5/+9
| | | | | | | | | | | | | | | | | | | | forms if you pass true
* | | | | Do not include the authenticity token in forms where remote: true as ajax ↵David Heinemeier Hansson2012-03-141-2/+9
| | | | | | | | | | | | | | | | | | | | forms use the meta-tag value
* | | | | Remove --http.José Valim2012-03-142-135/+0
| | | | |
* | | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignoredPiotr Sarnacki2012-03-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Don't ignore call to undefined method in Sweeper
| * | | | | Don't ignore call to undefined method in SweeperLevente Bagi2012-03-061-1/+1
| | | | | |
* | | | | | Add ActionController::HTTPSantiago Pastorino2012-03-147-8/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino]
* | | | | | Merge pull request #5421 from parndt/masterVijay Dev2012-03-141-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added missing 'end' to documentation example
| * | | | | | Added missing end to examplePhilip Arndt2012-03-141-0/+1
| | | | | | |
* | | | | | | Remove sprockets integration on ActionPackGuillermo Iguaran2012-03-138-537/+0
| | | | | | |
* | | | | | | Merge pull request #572 from sikachu/remove_activeresourceJosé Valim2012-03-132-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove Active Resource source files from the repository.
| * | | | | | | Remove Active Resource source files from the repositoryPrem Sichanugrist2012-03-132-3/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dear Active Resource, It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository. I will miss you, @sikachu.
* / | | | | | add include_hidden option to checkbox tagSergey Nartimov2012-03-131-2/+8
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-133-71/+165
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Added documentation for the ActionController::MimeResponds::Collector class.Mark Thomson2012-03-131-1/+24
| | | | | |
| * | | | | Revised explanation of fields_for usage.Mark Thomson2012-03-111-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | Minor tweak to previous comments on form_for and form_helper.rb preamble
| * | | | | Added clarification to description of how initial form values are derived.Mark Thomson2012-03-101-1/+2
| | | | | |
| * | | | | Merge branch '3.9.12'Mark Thomson2012-03-101-53/+84
| |\ \ \ \ \
| | * | | | | Revised explanation of form_for usageMark Thomson2012-03-101-53/+84
| | | | | | |
| * | | | | | Fix layout method doc formattingAlexey Vakhov2012-03-101-2/+1
| | | | | | |
| * | | | | | Fix comment about layout folders lookupAlexey Vakhov2012-03-091-2/+2
| |/ / / / /
| * | | | | Additional preamble comments in form_helper.rb.Mark Thomson2012-03-081-7/+18
| | | | | |
| * | | | | Small correction to the description of the role of the form builder.Mark Thomson2012-03-081-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | (endpoints are generated by form_for without reference to the form builder)
* | | | | add 'include_hidden' option to select tag, closes #5402Vasiliy Ermolovich2012-03-132-1/+4
| | | | |
* | | | | '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 Regexp