| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2 | Santiago Pastorino | 2012-03-28 | 1 | -1/+1 | |
| |\ \ | | | | | | | Changed the config.assets.manifest to nil | |||||
| | * | | Changed the config.assets.manifest to nil in the comments in the production ↵ | Anuj Dutta | 2012-03-28 | 1 | -1/+1 | |
| |/ / | | | | | | | config template. | |||||
| * | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 | |
| | | | | | | | | | Closes #5632 | |||||
| * | | Merge pull request #5640 from yahonda/address_ora_00918_with_oracle | Santiago Pastorino | 2012-03-28 | 1 | -1/+1 | |
| |\ \ | | | | | | | Address an error for test_has_many_through_polymorphic_has_one with Oracle | |||||
| | * | | Change the order argument from ('id') to ('taggings.id') | Yasuo Honda | 2012-03-28 | 1 | -1/+1 | |
| | |/ | | | | | | | to address ORA-00918 error | |||||
| * | | 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. | |||||
| * | | Fix #5549. | Jon Leighton | 2012-03-28 | 2 | -3/+7 | |
| | | | ||||||
| * | | Test for #5549. | Aaron Patterson | 2012-03-28 | 2 | -1/+16 | |
| | | | | | | | | | | | | | | | | | Cherry-picked from e96d04a2e4e244ea5053cb4e8ab97db604d0c796. Conflicts: activerecord/lib/active_record/attribute_methods/read.rb | |||||
| * | | Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms | Santiago Pastorino | 2012-03-28 | 5 | -14/+76 | |
| |\ \ | | | | | | | Embed auth token in remote forms | |||||
| | * | | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 5 | -14/+76 | |
| |/ / | | | | | | | | | | | | | | | 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 #5616 from cbartlett/migration-indent | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 | |
| | | | | | | | | | Fix indenting in migration generator | |||||
| * | | Merge pull request #5624 from rafaelfranca/fix-build | Michael Koziarski | 2012-03-27 | 1 | -1/+1 | |
| |\ \ | | | | | | | Fix build | |||||
| | * | | Add arel branch to the tests | Rafael Mendonça França | 2012-03-27 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | 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. | |||||
| * | | | | adding a branch to arel | Aaron Patterson | 2012-03-27 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #5618 from lest/patch-1 | Piotr Sarnacki | 2012-03-27 | 2 | -0/+15 | |
| |\ \ \ \ | |_|_|/ |/| | | | force datetime attributes to be changed | |||||
| | * | | | force datetime attributes to be changed | Sergey Nartimov | 2012-03-27 | 2 | -0/+15 | |
| | | | | | | | | | | | | | | | | | backport ddb5d2f756d9d2655a07791a3b62832efd588474 to 3-2-stable | |||||
| * | | | | Bumping to 3.2.3.rc1 | Santiago Pastorino | 2012-03-27 | 9 | -17/+17 | |
| | |_|/ |/| | | ||||||
| * | | | 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. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |