Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Return an actual boolean from xml_http_request?" | Xavier Noria | 2012-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Reason: This commit changes code that was committed some year and a half ago. The original code is an ordinary predicate that delegates straight to a boolean operator with no further unnecessaru adorments, as clearly explained in #5329. This change also may confuse users who may now believe they can rely now on singletons, while predicates in Rails rely on standard Ruby semantics for boolean values and guarantee no singletons whatsover. This reverts commit 6349791d5aaf652631b29f1371701fc2985fda83. | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-24 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile | ||||
| * | Fixed-width font fix for instance variable | Juanjo Bazán | 2012-03-20 | 1 | -1/+1 |
| | | |||||
* | | Return an actual boolean from xml_http_request? | Tim Pope | 2012-03-23 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5518 from rafaelfranca/minor-refactor | José Valim | 2012-03-23 | 1 | -11/+11 |
|\ \ | | | | | | | Remove code duplication | ||||
| * | | Remove code duplication | Rafael Mendonça França | 2012-03-19 | 1 | -11/+11 |
| | | | |||||
* | | | We dont need to merge in the parameters as thats all being reset by the rack ↵ | David Heinemeier Hansson | 2012-03-20 | 1 | -1/+0 |
|/ / | | | | | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing) | ||||
* | | Fix secure cookies when there are more than one space before the secure | Rafael Mendonça França | 2012-03-19 | 1 | -1/+1 |
| | | | | | | | | keyword | ||||
* | | Remove exclude option from ActionDispatch::SSL | Rafael Mendonça França | 2012-03-19 | 1 | -7/+0 |
| | | |||||
* | | Merge pull request #5503 from jeyb/leap_day_time_date_time_selector | Andrew White | 2012-03-19 | 1 | -6/+6 |
|\ \ | |/ |/| | Fixes issue #5222: DateTimeSelector builds invalid dates on leap days | ||||
| * | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when ↵ | Jey Balachandran | 2012-03-18 | 1 | -6/+6 |
| | | | | | | | | discarding both day and month. | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-19 | 1 | -19/+116 |
|\ \ | |/ |/| | |||||
| * | respond_with description: changed 'response' to 'format' | Mark Thomson | 2012-03-18 | 1 | -1/+1 |
| | | |||||
| * | Revised comments for respond_with | Mark Thomson | 2012-03-18 | 1 | -17/+18 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' | Mark Thomson | 2012-03-17 | 37 | -637/+163 |
| |\ | |||||
| * | | Revised description for responds_with | Mark Thomson | 2012-03-17 | 1 | -19/+115 |
| | | | |||||
* | | | time_tag support for blocks | Antonio Tapiador del Dujo | 2012-03-18 | 1 | -2/+7 |
| | | | |||||
* | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-03-17 | 1 | -1/+1 |
| | | | |||||
* | | | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.x | Rafael Mendonça França | 2012-03-17 | 1 | -23/+13 |
| | | | |||||
* | | | Rack::SSL -> ActionDispatch::SSL | Rafael Mendonça França | 2012-03-17 | 2 | -0/+88 |
| |/ |/| | |||||
* | | Add missing require | Santiago Pastorino | 2012-03-17 | 1 | -0/+1 |
| | | |||||
* | | Remove unused require | Santiago Pastorino | 2012-03-17 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-17 | 1 | -4/+4 |
|\ \ | | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile | ||||
| * | | Minor clarification in documentation language and spelling | Matthew Daubert | 2012-03-13 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #5480 from drogus/rendering-issues | José Valim | 2012-03-17 | 1 | -0/+1 |
| | | | | | | | | | | | | Fix for #5440 | ||||
* | | | fixed - warning: instance variable @controller not initialized | Sandeep | 2012-03-16 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgs | Piotr Sarnacki | 2012-03-16 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Fix exceptions messages in AC layouts | ||||
| * | | | Fix exceptions messages in AC layouts | Alexey Vakhov | 2012-03-10 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #5454 from luke-gru/luke-dev | Piotr Sarnacki | 2012-03-15 | 1 | -4/+11 |
|\ \ \ \ | | | | | | | | | | | allow zero-arity proc for AbstrController::layout | ||||
| * | | | | allow zero-arity proc for AbstrController::layout | Luke Gruber | 2012-03-15 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | proc without parameters can now be given to AbstractController::layout | ||||
* | | | | | strip null bytes from Location header as well | Brian Lopez | 2012-03-15 | 2 | -2/+2 |
|/ / / / | | | | | | | | | | | | | add tests for stripping \r\n chars since that's already happening | ||||
* | | | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequence | Aaron Patterson | 2012-03-15 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | fix ArgumentError being raised in case of invalid byte sequences | ||||
| * | | | | fix ArgumentError being raised in case of invalid byte sequences | Michael Reinsch | 2012-03-08 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Simplify helpers handling. Ensure Metal can run AC hooks. | José Valim | 2012-03-15 | 4 | -35/+34 |
| | | | | | |||||
* | | | | | Remove ActionController::TestCase#rescue_action_in_public! | Piotr Sarnacki | 2012-03-15 | 1 | -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 Hansson | 2012-03-14 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | forms if you pass true | ||||
* | | | | | Do not include the authenticity token in forms where remote: true as ajax ↵ | David Heinemeier Hansson | 2012-03-14 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | forms use the meta-tag value | ||||
* | | | | | Remove --http. | José Valim | 2012-03-14 | 2 | -135/+0 |
| | | | | | |||||
* | | | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored | Piotr Sarnacki | 2012-03-14 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Don't ignore call to undefined method in Sweeper | ||||
| * | | | | | Don't ignore call to undefined method in Sweeper | Levente Bagi | 2012-03-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Add ActionController::HTTP | Santiago Pastorino | 2012-03-14 | 7 | -8/+154 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino] | ||||
* | | | | | | Merge pull request #5421 from parndt/master | Vijay Dev | 2012-03-14 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added missing 'end' to documentation example | ||||
| * | | | | | | Added missing end to example | Philip Arndt | 2012-03-14 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Remove sprockets integration on ActionPack | Guillermo Iguaran | 2012-03-13 | 8 | -537/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #572 from sikachu/remove_activeresource | José Valim | 2012-03-13 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove Active Resource source files from the repository. | ||||
| * | | | | | | | Remove Active Resource source files from the repository | Prem Sichanugrist | 2012-03-13 | 2 | -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 tag | Sergey Nartimov | 2012-03-13 | 1 | -2/+8 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-13 | 3 | -71/+165 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Added documentation for the ActionController::MimeResponds::Collector class. | Mark Thomson | 2012-03-13 | 1 | -1/+24 |
| | | | | | | |||||
| * | | | | | Revised explanation of fields_for usage. | Mark Thomson | 2012-03-11 | 1 | -10/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | Minor tweak to previous comments on form_for and form_helper.rb preamble |