aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix the redirect when it receive blocks with arity of 1.Rafael Mendonça França2012-03-312-1/+17
* Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_selectAaron Patterson2012-03-303-21/+29
|\
| * refactor instantiate method in base, so we remove nesting if's which make the...Arturo Pie2012-03-292-12/+19
| * refactor the checking of the attributes of the record in IdentityMap#add, so ...Arturo Pie2012-03-292-5/+12
| * Do not add record to identity map if the record doesn't have values for all t...Arturo Pie2012-03-291-1/+1
| * Adds a test that breaks IM when using #selectArturo Pie2012-03-291-12/+6
* | Merge branch '3-2-3' into 3-2-stableSantiago Pastorino2012-03-3010-9/+13
|\ \
| * | Bump up to 3.2.3Santiago Pastorino2012-03-309-9/+9
| * | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| * | Bumping to 3.2.3.rc2Santiago Pastorino2012-03-299-9/+9
| * | Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| * | Add missing CHANGELOG entrySantiago Pastorino2012-03-291-0/+2
| * | fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
| * | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
| * | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
| * | Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-285-14/+76
| * | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
* | | Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-303-2/+20
* | | Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-303-0/+10
| |/ |/|
* | fix incorrect url in the deprecation message for vendor/plugins [ci skip]Vijay Dev2012-03-291-1/+1
* | Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2Santiago Pastorino2012-03-281-1/+1
|\ \
| * | Changed the config.assets.manifest to nil in the comments in the production c...Anuj Dutta2012-03-281-1/+1
|/ /
* | Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-282-2/+3
* | Merge pull request #5640 from yahonda/address_ora_00918_with_oracleSantiago Pastorino2012-03-281-1/+1
|\ \
| * | Change the order argument from ('id') to ('taggings.id')Yasuo Honda2012-03-281-1/+1
| |/
* | Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-282-17/+23
* | Fix #5549.Jon Leighton2012-03-282-3/+7
* | Test for #5549.Aaron Patterson2012-03-282-1/+16
* | Merge pull request #5633 from drogus/embed-auth-token-in-remote-formsSantiago Pastorino2012-03-285-14/+76
|\ \
| * | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-285-14/+76
|/ /
* | Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-281-2/+2
* | Merge pull request #5624 from rafaelfranca/fix-buildMichael Koziarski2012-03-271-1/+1
|\ \
| * | Add arel branch to the testsRafael Mendonça França2012-03-271-1/+1
|/ /
* | Merge pull request #5622 from rafaelfranca/fix-2492-3-2Jeremy Kemper2012-03-272-2/+38
|\ \
| * | Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-272-16/+24
| * | Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.Andrey Samsonov2012-03-272-2/+30
* | | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-273-8/+12
|\ \ \
| * | | Don't break Haml with textarea newline fix.James Coleman2012-03-273-8/+12
* | | | adding a branch to arelAaron Patterson2012-03-271-2/+2
* | | | Merge pull request #5618 from lest/patch-1Piotr Sarnacki2012-03-272-0/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | force datetime attributes to be changedSergey Nartimov2012-03-272-0/+15
* | | | Bumping to 3.2.3.rc1Santiago Pastorino2012-03-279-17/+17
| |_|/ |/| |
* | | Merge pull request #5603 from drogus/fix-rendered-format-for-render-partialJosé Valim2012-03-273-2/+22
|\ \ \
| * | | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-273-2/+22
|/ / /
* | | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
* | | Merge pull request #5597 from carlosantoniodasilva/fix-build-3-2José Valim2012-03-261-1/+1
|\ \ \ | |_|/ |/| |
| * | Return the same session data object when setting session idCarlos Antonio da Silva2012-03-241-1/+1
* | | Merge pull request #5596 from lest/patch-3Piotr Sarnacki2012-03-262-1/+12
|\ \ \ | | |/ | |/|
| * | apply form_for namespace option to date_selectSergey Nartimov2012-03-262-1/+12
|/ /
* / Fix 'Security#Mass Assignment' URL typoAbe Voelker2012-03-261-1/+1
|/