Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #5621 from rafaelfranca/fix-2492-master | Jeremy Kemper | 2012-03-27 | 1 | -0/+34 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Check if the options hash already exists and merge it with the another | Rafael Mendonça França | 2012-03-27 | 1 | -6/+18 | |
| * | | | | | | Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn... | Andrey Samsonov | 2012-03-27 | 1 | -0/+22 | |
* | | | | | | | Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master | Santiago Pastorino | 2012-03-27 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 1 | -6/+6 | |
| |/ / / / / / | ||||||
* / / / / / / | adds delegetion for eof? to AD::Http::UploadedFile | Jens Fahnenbruck | 2012-03-27 | 1 | -0/+6 | |
|/ / / / / / | ||||||
* | | | | | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 2 | -0/+14 | |
* | | | | | | change number_with_precision to not return negative zeros | Tim McEwan | 2012-03-27 | 1 | -0/+1 | |
* | | | | | | Don't ignore non Enumerable values passed to sanitize (closes #5585) | Piotr Sarnacki | 2012-03-27 | 1 | -0/+18 | |
* | | | | | | Remove warning added by my own commit :fire: | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+1 | |
* | | | | | | Merge pull request #5561 from carlosantoniodasilva/form-builder-block-arg | Aaron Patterson | 2012-03-26 | 1 | -0/+12 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Properly deprecate the block argument in AV FormBuilder | Carlos Antonio da Silva | 2012-03-23 | 1 | -0/+12 | |
* | | | | | | | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 1 | -0/+8 | |
* | | | | | | | Allow a defining custom member field on resources | Jamie Macey | 2012-03-25 | 1 | -0/+18 | |
* | | | | | | | Use the new scope syntax | Rafael Mendonça França | 2012-03-23 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Fix secure cookies when there are more than one space before the secure | Rafael Mendonça França | 2012-03-19 | 1 | -0/+28 | |
* | | | | | | Remove exclude option from ActionDispatch::SSL | Rafael Mendonça França | 2012-03-19 | 1 | -6/+0 | |
* | | | | | | Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when dis... | Jey Balachandran | 2012-03-18 | 2 | -7/+21 | |
* | | | | | | time_tag support for blocks | Antonio Tapiador del Dujo | 2012-03-18 | 1 | -0/+4 | |
* | | | | | | Some refactoring and update ActionDispatch::SSL code to use the Rack 1.4.x | Rafael Mendonça França | 2012-03-17 | 1 | -14/+0 | |
* | | | | | | Rack::SSL -> ActionDispatch::SSL | Rafael Mendonça França | 2012-03-17 | 1 | -0/+149 | |
* | | | | | | Merge pull request #5480 from drogus/rendering-issues | José Valim | 2012-03-17 | 7 | -0/+45 | |
* | | | | | | Should use an argument in http_digest_authentication_test.rb | kennyj | 2012-03-17 | 1 | -1/+1 | |
* | | | | | | use consistent explicit module inclusion | Luke Gruber | 2012-03-16 | 3 | -6/+6 | |
* | | | | | | fixed - warning: ambiguous first argument; put parentheses or even spaces | Sandeep | 2012-03-16 | 1 | -1/+1 | |
* | | | | | | Merge pull request #5454 from luke-gru/luke-dev | Piotr Sarnacki | 2012-03-15 | 1 | -0/+33 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | allow zero-arity proc for AbstrController::layout | Luke Gruber | 2012-03-15 | 1 | -0/+33 | |
* | | | | | | | fix typo in redirect test | Brian Lopez | 2012-03-15 | 1 | -1/+1 | |
* | | | | | | | strip null bytes from Location header as well | Brian Lopez | 2012-03-15 | 1 | -0/+20 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequence | Aaron Patterson | 2012-03-15 | 1 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | fix ArgumentError being raised in case of invalid byte sequences | Michael Reinsch | 2012-03-08 | 1 | -0/+4 | |
* | | | | | | | Remove ActionController::TestCase#rescue_action_in_public! | Piotr Sarnacki | 2012-03-15 | 1 | -5/+0 | |
* | | | | | | | Allow you to force the authenticity_token to be rendered even on remote forms... | David Heinemeier Hansson | 2012-03-14 | 1 | -0/+11 | |
* | | | | | | | Do not include the authenticity token in forms where remote: true as ajax for... | David Heinemeier Hansson | 2012-03-14 | 1 | -0/+13 | |
* | | | | | | | Remove --http. | José Valim | 2012-03-14 | 8 | -201/+0 | |
* | | | | | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignored | Piotr Sarnacki | 2012-03-14 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't ignore call to undefined method in Sweeper | Levente Bagi | 2012-03-06 | 1 | -0/+16 | |
* | | | | | | | | Add ActionController::HTTP | Santiago Pastorino | 2012-03-14 | 8 | -0/+201 | |
* | | | | | | | | Remove remaining sprockets tests | Guillermo Iguaran | 2012-03-13 | 1 | -28/+0 | |
* | | | | | | | | Remove tests and fixtures for Sprockets on ActionPack | Guillermo Iguaran | 2012-03-13 | 14 | -409/+0 | |
* | | | | | | | | add include_hidden option to checkbox tag | Sergey Nartimov | 2012-03-13 | 1 | -0/+5 | |
* | | | | | | | | add 'include_hidden' option to select tag, closes #5402 | Vasiliy Ermolovich | 2012-03-13 | 1 | -0/+8 | |
* | | | | | | | | Remove unused method | Santiago Pastorino | 2012-03-12 | 1 | -4/+0 | |
* | | | | | | | | Merge pull request #5375 from nertzy/assert_template_with_regexp | Aaron Patterson | 2012-03-12 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | assert_template matches against Regexp | Grant Hutchins | 2012-03-10 | 1 | -0/+6 | |
* | | | | | | | | | Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separator | Aaron Patterson | 2012-03-12 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ensure u2029 is escaped in escape_javascript helper | benmmurphy | 2012-03-11 | 1 | -0/+2 | |
* | | | | | | | | | | Merge pull request #5366 from parndt/fix_issue_5324 | José Valim | 2012-03-11 | 2 | -165/+165 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fixes #5324 by removing default size options from input:text and default cols... | Philip Arndt | 2012-03-10 | 2 | -165/+165 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #5326 from lest/patch-2 | Michael Koziarski | 2012-03-10 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | |