aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5622 from rafaelfranca/fix-2492-3-2Jeremy Kemper2012-03-272-2/+38
|\ | | | | [3-2-stable] Fix label_tag to merge the options hash with the object hash
| * Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-272-16/+24
| | | | | | | | | | | | hash. Closes #2492 and #5614
| * Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.Andrey Samsonov2012-03-272-2/+30
| | | | | | | | | | | | objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
* | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
|\ \ | | | | | | Textarea newline fix breaks haml (3-2-stable)
| * | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
| | | | | | | | | | | | | | | | | | 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.
* | | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
| |/ |/|
* | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
| | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2José Valim2012-03-261-1/+1
|\ \ | |/ |/| Fix build for branch 3-2-stable - return the same session hash object
| * Return the same session data object when setting session idCarlos Antonio da Silva2012-03-241-1/+1
| | | | | | | | | | | | | | | | Make sure to return the same hash object instead of returning a new one. Returning a new one causes failures on cookie store tests, where it tests for the 'Set-Cookie' header with the session signature. This is due to the hash ordering changes on Ruby 1.8.7-p358.
* | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
|/
* Fix GH #5411. When precompiling, params method is undefined.kennyj2012-03-221-1/+1
|
* We dont need to merge in the parameters as thats all being reset by the rack ↵David Heinemeier Hansson2012-03-201-1/+0
| | | | headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing)
* Build fix for ruby1.8.7-358Arun Agrawal2012-03-192-9/+7
|
* Add missing test for #5308Piotr Sarnacki2012-03-173-0/+15
|
* Fix #5440 - multiple render_to_string breaks partials formatsPiotr Sarnacki2012-03-176-0/+31
| | | | | | | | | This fixes situation where rendering template to string sets `rendered_format` to the format rendered there. This is ok to have consistent formats rendered in partials, but it breaks on next renders if format is explicitly set or on last render where default format does not necessarily need to be the format of first rendered template.
* Merge pull request #5457 from brianmario/typo-fixAaron Patterson2012-03-151-1/+1
| | | | Fix typo in redirect test
* Merge pull request #5456 from brianmario/redirect-sanitizationAaron Patterson2012-03-153-2/+22
| | | | Strip null bytes from Location header
* Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
|\ | | | | 3 2 static invalid byte sequence
| * fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-082-0/+5
| |
* | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-152-10/+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-142-5/+20
| | | | | | | | forms if you pass true
* | Do not include the authenticity token in forms where remote: true as ajax ↵David Heinemeier Hansson2012-03-143-2/+22
| | | | | | | | forms use the meta-tag value
* | Fix layout method doc formattingAlexey Vakhov2012-03-131-2/+1
| |
* | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-3/+4
| | | | | | | | Also add missing entries and use the formating convention
* | changelog updates [ci skip]Vijay Dev2012-03-091-0/+11
|/
* Remove usage of deprecated module.José Valim2012-03-071-1/+0
|
* Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6
|
* Set the rendered_format on respond_to.José Valim2012-03-071-0/+1
|
* Just change the formats on first render, closes #5307, closes #5308.José Valim2012-03-071-2/+7
|
* Deprecate ActionController::SessionManagementSantiago Pastorino2012-03-061-0/+5
|
* Use latest rack-cache.José Valim2012-03-061-1/+1
|
* Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| | | | | | | We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280
* Failing test for mime responder respond_with using a block.Mario Visic2012-03-051-0/+36
|
* Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵Santiago Pastorino2012-03-032-1/+4
| | | | | | that info Closes #5245
* Add CHANGELOG entrySantiago Pastorino2012-03-021-0/+6
|
* Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-022-2/+8
|
* Merge branch '3-2-2' into 3-2-stableAaron Patterson2012-03-014-6/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-2: bumping to 3.2.2 Ensure [] respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
| * bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
| |
| * Merge branch '3-2-stable-security' into 3-2-2Aaron Patterson2012-03-013-5/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-stable-security: Ensure [] respects the status of the buffer. delete vulnerable AS::SafeBuffer#[] use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
| | * use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| | |
| | * fix output safety issue with select optionsSergey Nartimov2012-02-202-4/+11
| | |
| * | Merge pull request #5084 from johndouthat/patch-1Aaron Patterson2012-02-221-2/+1
| | | | | | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2...
| * | updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
| | |
* | | Add a new line after the textarea opening tag.Rafael Mendonça França2012-02-273-38/+38
| | | | | | | | | | | | Closes #393
* | | Adding tests for non-optional glob parametersAndrew White2012-02-261-2/+27
| | |
* | | Fix typo in match :to docsJustin Woodbridge2012-02-251-1/+1
| | |
* | | assert => assert_equalArun Agrawal2012-02-251-3/+3
| | |
* | | Checking headers in a better way. as doing hereArun Agrawal2012-02-251-4/+3
| | | | | | | | | | | | 406ece4729e8fd81f156bcb3fce16e938522466e
* | | Build fix for ruby187-p358Arun Agrawal2012-02-251-2/+7
| | |
* | | Avoid inspecting the whole route set, closes #1525José Valim2012-02-231-0/+6
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:22:12 +0000