| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | Add missing CHANGELOG entry | Santiago Pastorino | 2012-03-29 | 1 | -0/+2 |
| * | | fix incorrect url in the deprecation message for vendor/plugins [ci skip] | Vijay Dev | 2012-03-29 | 1 | -1/+1 |
| * | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 |
| * | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 2 | -17/+23 |
| * | | Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms | Santiago Pastorino | 2012-03-28 | 5 | -14/+76 |
| * | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 3 | -8/+12 |
* | | | Fix #5667. Preloading should ignore scoping. | Jon Leighton | 2012-03-30 | 3 | -2/+20 |
* | | | Remove the leading \n added by textarea on assert_select | Santiago Pastorino | 2012-03-30 | 3 | -0/+10 |
| |/
|/| |
|
* | | fix incorrect url in the deprecation message for vendor/plugins [ci skip] | Vijay Dev | 2012-03-29 | 1 | -1/+1 |
* | | 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 in the comments in the production c... | Anuj Dutta | 2012-03-28 | 1 | -1/+1 |
|/ / |
|
* | | Set proper rendered_format when doing render :inline | Santiago Pastorino | 2012-03-28 | 2 | -2/+3 |
* | | Merge pull request #5640 from yahonda/address_ora_00918_with_oracle | Santiago Pastorino | 2012-03-28 | 1 | -1/+1 |
|\ \ |
|
| * | | Change the order argument from ('id') to ('taggings.id') | Yasuo Honda | 2012-03-28 | 1 | -1/+1 |
| |/ |
|
* | | Cover one more case in auth_token and remote forms | Piotr Sarnacki | 2012-03-28 | 2 | -17/+23 |
* | | Fix #5549. | Jon Leighton | 2012-03-28 | 2 | -3/+7 |
* | | Test for #5549. | Aaron Patterson | 2012-03-28 | 2 | -1/+16 |
* | | Merge pull request #5633 from drogus/embed-auth-token-in-remote-forms | Santiago Pastorino | 2012-03-28 | 5 | -14/+76 |
|\ \ |
|
| * | | Added config.action_view.embed_authenticity_token_in_remote_forms | Piotr Sarnacki | 2012-03-28 | 5 | -14/+76 |
|/ / |
|
* | | Merge pull request #5616 from cbartlett/migration-indent | Santiago Pastorino | 2012-03-28 | 1 | -2/+2 |
* | | Merge pull request #5624 from rafaelfranca/fix-build | Michael Koziarski | 2012-03-27 | 1 | -1/+1 |
|\ \ |
|
| * | | 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 |
|\ \ |
|
| * | | Check if the options hash already exists and merge it with the another | Rafael Mendonça França | 2012-03-27 | 2 | -16/+24 |
| * | | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label. | Andrey Samsonov | 2012-03-27 | 2 | -2/+30 |
* | | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-haml | Santiago Pastorino | 2012-03-27 | 3 | -8/+12 |
|\ \ \ |
|
| * | | | Don't break Haml with textarea newline fix. | James Coleman | 2012-03-27 | 3 | -8/+12 |
* | | | | 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 | Sergey Nartimov | 2012-03-27 | 2 | -0/+15 |
* | | | | 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 |
|\ \ \ |
|
| * | | | If partial is rendered in controller, grab format from template | Piotr Sarnacki | 2012-03-27 | 3 | -2/+22 |
|/ / / |
|
* | | | Merge pull request #2621 from icco/master | Aaron Patterson | 2012-03-26 | 1 | -1/+1 |
* | | | Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2 | José Valim | 2012-03-26 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Return the same session data object when setting session id | Carlos Antonio da Silva | 2012-03-24 | 1 | -1/+1 |
* | | | Merge pull request #5596 from lest/patch-3 | Piotr Sarnacki | 2012-03-26 | 2 | -1/+12 |
|\ \ \
| | |/
| |/| |
|
| * | | 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 |
* | Merge pull request #5537 from kennyj/fix_4399-32 | Aaron Patterson | 2012-03-23 | 2 | -6/+34 |
|\ |
|
| * | 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 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 |
|\ \ |
|
| * | | 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 |
|/ / |
|
* | | 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. | 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 |
|\| | |
|
| * | | [3-2-stable] Port of #5522 'Fix adding/removing field's index when generating... | Marcelo Silveira | 2012-03-21 | 2 | -0/+21 |
|/ / |
|