| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix broken test from the earlier merge conflict | Prem Sichanugrist | 2012-04-23 | 1 | -9/+11 |
| | | | | | Seriously people, please run the test before submitting pull request. | ||||
| * | Merge pull request #5866 from tiegz/minor_fixes_3-2-stable | Aaron Patterson | 2012-04-23 | 2 | -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 changes | Tieg Zaharia | 2012-04-16 | 2 | -47/+23 |
| | | | | | | | | | | | | | Conflicts: actionpack/test/template/render_test.rb | ||||
| | * | catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead | Tieg Zaharia | 2012-04-16 | 2 | -1/+10 |
| | | | |||||
| * | | Updated other README to point 3-2-stable | Arun Agrawal | 2012-04-23 | 1 | -1/+1 |
| |/ | |||||
| * | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 2 | -2/+2 |
| | | |||||
| * | Fix the redirect when it receive blocks with arity of 1. | Rafael Mendonça França | 2012-03-31 | 2 | -1/+17 |
| | | | | | Closes #5677 | ||||
| * | Merge branch '3-2-3' into 3-2-stable | Santiago Pastorino | 2012-03-30 | 2 | -1/+5 |
| |\ | |||||
| | * | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
| | | | |||||
| | * | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 3 | -0/+10 |
| | | | |||||
| | * | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 1 | -1/+1 |
| | | | |||||
| | * | Add missing CHANGELOG entry | Santiago Pastorino | 2012-03-29 | 1 | -0/+2 |
| | | | |||||
| | * | Add missing CHANGELOG entry | Santiago Pastorino | 2012-03-29 | 1 | -0/+2 |
| | | | |||||
| | * | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 |
| | | | | | | | | | Closes #5632 | ||||
| | * | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 2 | -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-forms | Santiago Pastorino | 2012-03-28 | 4 | -14/+74 |
| | | | | | | | | | Embed auth token in remote forms | ||||
| | * | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 3 | -8/+12 |
| | | | | | | | | | Textarea newline fix breaks haml (3-2-stable) | ||||
| * | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 3 | -0/+10 |
| | | | |||||
| * | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 |
| | | | | | | | | | Closes #5632 | ||||
| * | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 2 | -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_forms | Piotr Sarnacki | 2012-03-28 | 4 | -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-2 | Jeremy Kemper | 2012-03-27 | 2 | -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 another | Rafael Mendonça França | 2012-03-27 | 2 | -16/+24 |
| | | | | | | | | | | | | | | | | | | | hash. Closes #2492 and #5614 | ||||
| | * | | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label. | Andrey Samsonov | 2012-03-27 | 2 | -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-haml | Santiago Pastorino | 2012-03-27 | 3 | -8/+12 |
| |\ \ \ | |_|/ |/| | | Textarea newline fix breaks haml (3-2-stable) | ||||
| | * | | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 3 | -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.rc1 | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 |
| | |/ |/| | |||||
| * | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 3 | -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-2 | José Valim | 2012-03-26 | 1 | -1/+1 |
| |\ \ | |/ |/| | Fix build for branch 3-2-stable - return the same session hash object | ||||
| | * | Return the same session data object when setting session id | Carlos Antonio da Silva | 2012-03-24 | 1 | -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_select | Sergey Nartimov | 2012-03-26 | 2 | -1/+12 |
| |/ | |||||
| * | Fix GH #5411. When precompiling, params method is undefined. | kennyj | 2012-03-22 | 1 | -1/+1 |
| | | |||||
| * | We dont need to merge in the parameters as thats all being reset by the rack ↵ | David Heinemeier Hansson | 2012-03-20 | 1 | -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-358 | Arun Agrawal | 2012-03-19 | 2 | -9/+7 |
| | | |||||
| * | Add missing test for #5308 | Piotr Sarnacki | 2012-03-17 | 3 | -0/+15 |
| | | |||||
| * | Fix #5440 - multiple render_to_string breaks partials formats | Piotr Sarnacki | 2012-03-17 | 6 | -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-fix | Aaron Patterson | 2012-03-15 | 1 | -1/+1 |
| | | | | | Fix typo in redirect test | ||||
| * | Merge pull request #5456 from brianmario/redirect-sanitization | Aaron Patterson | 2012-03-15 | 3 | -2/+22 |
| | | | | | Strip null bytes from Location header | ||||
| * | Merge pull request #5338 from mreinsch/3-2-static_invalid_byte_sequence | Aaron Patterson | 2012-03-15 | 2 | -0/+5 |
| |\ | | | | | 3 2 static invalid byte sequence | ||||
| | * | fix ArgumentError being raised in case of invalid byte sequences | Michael Reinsch | 2012-03-08 | 2 | -0/+5 |
| | | | |||||
| * | | Remove ActionController::TestCase#rescue_action_in_public! | Piotr Sarnacki | 2012-03-15 | 2 | -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 Hansson | 2012-03-14 | 2 | -5/+20 |
| | | | | | | | | | forms if you pass true | ||||
| * | | Do not include the authenticity token in forms where remote: true as ajax ↵ | David Heinemeier Hansson | 2012-03-14 | 3 | -2/+22 |
| | | | | | | | | | forms use the meta-tag value | ||||
| * | | Fix layout method doc formatting | Alexey Vakhov | 2012-03-13 | 1 | -2/+1 |
| | | | |||||
| * | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 1 | -3/+4 |
| | | | | | | | | | Also add missing entries and use the formating convention | ||||
| * | | changelog updates [ci skip] | Vijay Dev | 2012-03-09 | 1 | -0/+11 |
| |/ | |||||
| * | Remove usage of deprecated module. | José Valim | 2012-03-07 | 1 | -1/+0 |
| | | |||||
| * | Add test case for #5307 | Carlos Antonio da Silva | 2012-03-07 | 1 | -2/+6 |
| | | |||||
| * | Set the rendered_format on respond_to. | José Valim | 2012-03-07 | 1 | -0/+1 |
| | | |||||
| * | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionpack