Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #5603 from drogus/fix-rendered-format-for-render-partial | José Valim | 2012-03-27 | 3 | -2/+22 |
|\ | | | | | Fix rendered format for render partial | ||||
| * | 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 #2621 from icco/master | Aaron Patterson | 2012-03-26 | 1 | -1/+1 |
| | | | | Issue with schema dump | ||||
* | 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. | ||||
* | | Merge pull request #5596 from lest/patch-3 | Piotr Sarnacki | 2012-03-26 | 2 | -1/+12 |
|\ \ | | | | | | | apply form_for namespace option to date_select | ||||
| * | | apply form_for namespace option to date_select | Sergey Nartimov | 2012-03-26 | 2 | -1/+12 |
|/ / | |||||
* / | Fix 'Security#Mass Assignment' URL typo | Abe Voelker | 2012-03-26 | 1 | -1/+1 |
|/ | |||||
* | chdir before globbing so that we don't need to escape directory names. | Aaron Patterson | 2012-03-23 | 1 | -1/+30 |
| | | | | fixes #5521 | ||||
* | Merge pull request #5537 from kennyj/fix_4399-32 | Aaron Patterson | 2012-03-23 | 2 | -6/+34 |
|\ | | | | | [3-2-stable] migrate(:down) method with table_name_prefix | ||||
| * | migrate(:down) method with table_name_prefix | kennyj | 2012-03-21 | 2 | -6/+34 |
| | | |||||
* | | Merge pull request #5558 from carlosantoniodasilva/fix-build-3-2 | Piotr Sarnacki | 2012-03-23 | 1 | -16/+16 |
|\ \ | | | | | | | Fix build for branch 3-2-stable - Part 2 | ||||
| * | | Fix identity map tests | Carlos Antonio da Silva | 2012-03-23 | 1 | -16/+16 |
|/ / | |||||
* | | Merge pull request #5557 from carlosantoniodasilva/fix-build-3-2 | Aaron Patterson | 2012-03-22 | 13 | -46/+45 |
|\ \ | | | | | | | Fix build for branch 3-2-stable | ||||
| * | | Add order to tests that rely on db ordering, to fix failing tests on pg | Carlos Antonio da Silva | 2012-03-22 | 13 | -46/+45 |
|/ / | | | | | | | | | | | | | Also skip persistente tests related to UPDATE + ORDER BY for postgresql PostgreSQL does not support updates with order by, and these tests are failing randomly depending on the fixture loading order now. | ||||
* | | Merge pull request #5525 from kennyj/fix_5411 | José Valim | 2012-03-22 | 2 | -1/+13 |
|\ \ | | | | | | | Fix GH #5411. When precompiling, params method is undefined. | ||||
| * | | Fix GH #5411. When precompiling, params method is undefined. | kennyj | 2012-03-22 | 2 | -1/+13 |
| | | | |||||
* | | | Merge pull request #5542 from mhfs/port_5522_to_32stable | Piotr Sarnacki | 2012-03-21 | 2 | -0/+21 |
|\| | | | | | | | | Port of #5522 'Fix adding/removing field's index when generating migration' | ||||
| * | | [3-2-stable] Port of #5522 'Fix adding/removing field's index when ↵ | Marcelo Silveira | 2012-03-21 | 2 | -0/+21 |
|/ / | | | | | | | generating migration' | ||||
* | | Merge pull request #5533 from mhfs/migration_blank_line_3_2 | José Valim | 2012-03-21 | 2 | -1/+2 |
|\ \ | |/ |/| | [3-2-stable] Remove blank line from generated migration | ||||
| * | [3-2-stable] Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 2 | -1/+2 |
|/ | |||||
* | 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) | ||||
* | Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable | José Valim | 2012-03-18 | 2 | -9/+7 |
|\ | | | | | Build fix 1.8.7 3 2 stable | ||||
| * | Build fix for ruby1.8.7-358 | Arun Agrawal | 2012-03-19 | 2 | -9/+7 |
|/ | |||||
* | Increase minimum version of mail. | Mikel Lindsaar | 2012-03-19 | 1 | -1/+1 |
| | | | | | Second security vulnerability found in mail file delivery method patched in version 2.4.4. | ||||
* | Merge pull request #5498 from arunagw/build_fix_app_generator_test_3-2-stable | José Valim | 2012-03-18 | 1 | -1/+1 |
|\ | | | | | Build fix app generator test 3 2 stable | ||||
| * | Build fix for app_generator_test.rb | Arun Agrawal | 2012-03-18 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #5493 from kennyj/fix_5435-32 | Piotr Sarnacki | 2012-03-18 | 2 | -0/+13 |
|\ | | | | | [3-2-stable] Fix GH #5435. db:structure:dump should be re-enable. | ||||
| * | Fix GH #5435. db:structure:dump should be re-enable. | kennyj | 2012-03-18 | 2 | -0/+13 |
|/ | |||||
* | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only | Piotr Sarnacki | 2012-03-17 | 1 | -1/+1 |
| | |||||
* | Ensure load hooks can be called more than once with different contexts. | José Valim | 2012-03-17 | 2 | -6/+35 |
| | |||||
* | Merge pull request #5480 from drogus/rendering-issues | José Valim | 2012-03-17 | 8 | -0/+46 |
|\ | | | | | Fix for #5440 | ||||
| * | 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 #5437 from kennyj/fix_5430 | Aaron Patterson | 2012-03-15 | 2 | -1/+8 |
| | | | | Fix GH #5430. A Payload name for schema_search_path should be SCHEMA. | ||||
* | 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 |
| | | |||||
* | | Check for existence of exactly the called `fixture_path=` method | Piotr Sarnacki | 2012-03-15 | 1 | -2/+2 |
| | | |||||
* | | 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 | ||||
* | | Merge pull request #5423 from jrochkind/checkout_account_for_monitor_model | Aaron Patterson | 2012-03-14 | 1 | -9/+18 |
|\ \ | | | | | | | ConnectionPool.checkout needs to be restructured to take account of ruby's "non-blocking" strategy for mutex ConditionVariables | ||||
| * | | ConnectionPool.checkout takes account of ruby using 'non-blocking condition ↵ | Jonathan Rochkind | 2012-03-13 | 1 | -9/+18 |
|/ / | | | | | | | variables' in mutex ConditionVariables | ||||
* | | Merge pull request #5417 from kennyj/fix_5399-32 | Aaron Patterson | 2012-03-13 | 2 | -2/+8 |
|\ \ | | | | | | | [3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::ConnectionSpecification objects. | ||||
| * | | [3-2-stable] Fix GH #5399. connection_pools's keys are ↵ | kennyj | 2012-03-14 | 2 | -2/+8 |
| | | | | | | | | | | | | ActiveRecord::Base::ConnectionSpecification objects. | ||||
* | | | Close string quotes | João Britto | 2012-03-13 | 1 | -1/+1 |
| | | |