Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. (master) | ||||
| * | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 1 | -6/+6 |
| | | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation. | ||||
* | | adds delegetion for eof? to AD::Http::UploadedFile | Jens Fahnenbruck | 2012-03-27 | 1 | -0/+6 |
|/ | | | | | if you want to read the file you may need to ask if there is something to read from | ||||
* | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 2 | -0/+14 |
| | | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header. | ||||
* | 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 |
| | | | | | | | | | When someone accidentally passes a string to sanitize like: sanitize("<span>foo</span>", :tags => "b") there is no indication that it's the wrong way and span will not be removed. | ||||
* | Remove warning added by my own commit :fire: | Carlos Antonio da Silva | 2012-03-26 | 1 | -1/+1 |
| | | | | Commit: 7a0cf2f5294e8bcef547642435636b394340a3e4 | ||||
* | 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 | ||||
| * | Properly deprecate the block argument in AV FormBuilder | Carlos Antonio da Silva | 2012-03-23 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | Commit 56089ca986c767763f29159c8de0aa1ebabfd4d2 introduced a backward incompatible change by changing the method signature of the FormBuilder. This brings back the same method signature warning in case someone gives a block to the builder. More info: https://github.com/rails/rails/commit/56089ca986c767763f29159c8de0aa1ebabfd4d2#commitcomment-1116166 | ||||
* | | 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 |
| | | | | | | | | | | | | | | | | | | | | By default, resources routes are created with :resource/:id. A model defining to_param can make prettier urls by using something more readable than an integer ID, but since the route picks it up as :id you wind up with awkward User.find_by_username(params[:id]) calls. By overriding the key to be used in @request.params you can be more obvious in your intent. | ||||
* | | 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 |
| | | | | keyword | ||||
* | 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 ↵ | Jey Balachandran | 2012-03-18 | 2 | -7/+21 |
| | | | | discarding both day and month. | ||||
* | 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 |
| | | | | Fix for #5440 | ||||
* | 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 |
| | | | | aid ease of understanding and readability for tests | ||||
* | 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 | ||||
| * | allow zero-arity proc for AbstrController::layout | Luke Gruber | 2012-03-15 | 1 | -0/+33 |
| | | | | | | | | | | proc without parameters can now be given to AbstractController::layout | ||||
* | | 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 |
|/ | | | | 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/+4 |
|\ | | | | | 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/+4 |
| | | |||||
* | | 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 | -0/+11 |
| | | | | | | | | 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 | -0/+13 |
| | | | | | | | | forms use the meta-tag value | ||||
* | | 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 | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino] | ||||
* | | | 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 | ||||
| * | | | assert_template matches against Regexp | Grant Hutchins | 2012-03-10 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | ensure u2029 is escaped in escape_javascript helper | ||||
| * | | | | 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 and rows options from textarea. | ||||
| * | | | | Fixes #5324 by removing default size options from input:text and default ↵ | Philip Arndt | 2012-03-10 | 2 | -165/+165 |
| | |_|/ | |/| | | | | | | | | | | cols and rows options from textarea. | ||||
* | | | | Merge pull request #5326 from lest/patch-2 | Michael Koziarski | 2012-03-10 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | configure how unverified request will be handled | ||||
| * | | | configure how unverified request will be handled | Sergey Nartimov | 2012-03-09 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | @controller already includes url_helpers in with_routing method | Santiago Pastorino | 2012-03-10 | 1 | -1/+0 |
| | | | |||||
* | | | Add missing require | Santiago Pastorino | 2012-03-10 | 1 | -0/+1 |
| | | |