Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | | Added clarification to description of how initial form values are derived. | Mark Thomson | 2012-03-10 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge branch '3.9.12' | Mark Thomson | 2012-03-10 | 1 | -53/+84 |
| |\ \ \ \ \ | |||||
| | * | | | | | Revised explanation of form_for usage | Mark Thomson | 2012-03-10 | 1 | -53/+84 |
| | | | | | | | |||||
| * | | | | | | Fix layout method doc formatting | Alexey Vakhov | 2012-03-10 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Fix comment about layout folders lookup | Alexey Vakhov | 2012-03-09 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Additional preamble comments in form_helper.rb. | Mark Thomson | 2012-03-08 | 1 | -7/+18 |
| | | | | | | |||||
| * | | | | | Small correction to the description of the role of the form builder. | Mark Thomson | 2012-03-08 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | (endpoints are generated by form_for without reference to the form builder) | ||||
* | | | | | add 'include_hidden' option to select tag, closes #5402 | Vasiliy Ermolovich | 2012-03-13 | 2 | -1/+4 |
| | | | | | |||||
* | | | | | 'module' is reserved word. Sample of code with error - not cool. | Egor Homakov | 2012-03-13 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Updated description of #retrieve_collector_from_mimes | Mark Thomson | 2012-03-13 | 1 | -2/+6 |
| | | | | | |||||
* | | | | | Merge pull request #5375 from nertzy/assert_template_with_regexp | Aaron Patterson | 2012-03-12 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | assert_template matches against Regexp | ||||
| * | | | | | assert_template matches against Regexp | Grant Hutchins | 2012-03-10 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for more strict template assertions, while maintaining backward compatibility. For example, if you use assert_template("foo/bar") and "foo/bar/baz" was rendered, the test passes. But if you use assert_template(%r{\Afoo/bar\Z}), you will catch that a different template was rendered. Also, if you passed an unsupported argument to assert_template() in the past, it would silently succeed. Now it raises an ArgumentError. | ||||
* | | | | | | Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator | Aaron Patterson | 2012-03-12 | 1 | -1/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | ensure u2029 is escaped in escape_javascript helper | ||||
| * | | | | | | ensure u2029 is escaped in escape_javascript helper | benmmurphy | 2012-03-11 | 1 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5366 from parndt/fix_issue_5324 | José Valim | 2012-03-11 | 4 | -21/+16 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea. | ||||
| * | | | | | | Fix unintended removal of 'cols' from a text_area example. | Philip Arndt | 2012-03-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixes #5324 by removing default size options from input:text and default ↵ | Philip Arndt | 2012-03-10 | 4 | -22/+17 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | cols and rows options from textarea. | ||||
* | | | | | | Merge pull request #5326 from lest/patch-2 | Michael Koziarski | 2012-03-10 | 1 | -2/+18 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | configure how unverified request will be handled | ||||
| * | | | | | configure how unverified request will be handled | Sergey Nartimov | 2012-03-09 | 1 | -2/+18 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be configured using `:with` option in `protect_from_forgery` method or `request_forgery_protection_method` config option possible values: - :reset_session (default) - :exception new applications are generated with: protect_from_forgery :with => :exception |