aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-292-8/+58
| | | | | | | | (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f) Conflicts: actionpack/test/controller/test_test.rb
* Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-283-1/+26
| | | | closes #3341
* Do not mutate options hashCarlos Antonio da Silva2012-04-272-2/+8
|
* fix number_to_human docs [ci skip]Vijay Dev2012-04-261-2/+2
|
* Fix broken test from the earlier merge conflictPrem Sichanugrist2012-04-231-9/+11
| | | | Seriously people, please run the test before submitting pull request.
* Merge pull request #5866 from tiegz/minor_fixes_3-2-stableAaron Patterson2012-04-232-42/+27
|\ | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
| * converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-162-47/+23
| | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb
| * catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-162-1/+10
| |
* | Updated other README to point 3-2-stableArun Agrawal2012-04-231-1/+1
|/
* default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-082-2/+2
|
* Fix the redirect when it receive blocks with arity of 1.Rafael Mendonça França2012-03-312-1/+17
| | | | Closes #5677
* Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-302-1/+5
|\
| * Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
| |
| * Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| |
| * Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
| |
| * Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| |
| * Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| |
| * Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
| | | | | | | | Closes #5632
| * Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
| | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
| * Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-284-14/+74
| | | | | | | | Embed auth token in remote forms
| * Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
| | | | | | | | Textarea newline fix breaks haml (3-2-stable)
* | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| |
* | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
| | | | | | | | Closes #5632
* | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
| | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
* | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-284-14/+74
| | | | | | | | | | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default)
* | 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
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:05:21 +0000