aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | use bind values for join columnsAaron Patterson2012-11-106-12/+36
* | | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-163-1/+27
* | | Merge pull request #8227 from senny/backport_8139Rafael Mendonça França2012-11-154-3/+18
|\ \ \
| * | | backport #8139, `plugin new` adds dummy app tasks when necessary. …Yves Senn2012-11-154-2/+17
| * | | Fixes issue #6251David Padilla2012-11-151-1/+1
|/ / /
* | | Merge pull request #8218 from DawidJanczak/form-tag-docCarlos Antonio da Silva2012-11-141-2/+2
|\ \ \
| * | | [ci skip] Correct examples for form_tag helper.DawidJanczak2012-11-141-2/+2
|/ / /
* | | fix testJon Leighton2012-11-131-3/+3
* | | Merge pull request #8209 from senny/backport_8176Rafael Mendonça França2012-11-133-1/+18
|\ \ \
| * | | backport #8176, `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-133-1/+18
* | | | Merge pull request #8204 from nikitug/fix_dynamic_finder_result_checkRafael Mendonça França2012-11-134-2/+21
|\ \ \ \
| * | | | Use nil? instead of blank? to check dynamic finder resultNikita Afanasenko2012-11-134-1/+17
* | | | | Merge pull request #8188 from courtland/habtm-fix-stableCarlos Antonio da Silva2012-11-136-1/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix deleting from a HABTM join table upon destroying an object of a model wit...Nick Rogers2012-11-136-1/+31
|/ / / /
* | | | Merge pull request #8205 from kennyj/fix_6951-32Rafael Mendonça França2012-11-133-6/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only da...kennyj2012-11-143-6/+22
|/ / /
* | | Revert "Use MiniTest in Ruby 1.8 if it is available."Carlos Antonio da Silva2012-11-132-8/+1
* | | Fix warning with assigned but not used variableCarlos Antonio da Silva2012-11-131-3/+3
* | | Add changelog entry for #8200 [ci skip]Carlos Antonio da Silva2012-11-131-0/+7
* | | Update mocha version to 0.13.0 and change requiresCarlos Antonio da Silva2012-11-1311-12/+12
* | | Fix json encoding test with ruby 1.8.7 and random hash orderCarlos Antonio da Silva2012-11-131-1/+2
* | | Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixesCarlos Antonio da Silva2012-11-133-5/+11
|\ \ \
| * | | Avoid a Mocha deprecation warning.James Mead2012-11-131-1/+1
| * | | Fix for Test::Unit Mocha compatibility.James Mead2012-11-131-3/+5
| * | | Use MiniTest in Ruby 1.8 if it is available.James Mead2012-11-131-1/+3
| * | | Copy Mocha bug fix.James Mead2012-11-131-0/+2
* | | | Merge pull request #8199 from senny/backport_8182Carlos Antonio da Silva2012-11-133-1/+24
|\ \ \ \ | |/ / / |/| | |
| * | | backport #8185, `#as_json` isolates options when encoding a hash.Yves Senn2012-11-133-1/+24
|/ / /
* | | Lock mocha in ~> 0.12.x until we fix the Ruby 1.8.7 issues with 0.13.0Carlos Antonio da Silva2012-11-121-1/+1
* | | Merge pull request #8193 from claudiob/add_rails329_release_dateRafael Mendonça França2012-11-127-7/+7
|\ \ \
| * | | Add release date of Rails 3.2.9 to documentationclaudiob2012-11-127-7/+7
|/ / /
* | | Merge pull request #8154 from bogdan/has_one_association_performanceCarlos Antonio da Silva2012-11-123-1/+24
* | | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-129-9/+9
|\ \ \ | |/ / |/| |
| * | Bump to 3.2.9Santiago Pastorino2012-11-129-9/+9
| * | Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
* | | Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
* | | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-099-9/+9
|\| |
| * | Bump up to 3.2.9.rc3Santiago Pastorino2012-11-099-9/+9
| * | Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
| * | Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
* | | Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
|\ \ \
| * | | Lock sprockets to 2.2.xGuillermo Iguaran2012-11-091-1/+1
| |/ /
* | | Fix redirect example blockCarlos Antonio da Silva2012-11-091-3/+3
* | | Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
* | | Merge pull request #8082 from nikitug/backport_serialized_attributes_before_t...Carlos Antonio da Silva2012-11-093-0/+24
|\ \ \
| * | | Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-11-093-0/+24
|/ / /
* | | Merge pull request #8093 from nikitug/keep_app_x_ua_compatibleCarlos Antonio da Silva2012-11-083-1/+46
* | | Merge pull request #8027 from daenney/masterXavier Noria2012-11-083-3/+17
* | | Merge pull request #8149 from senny/backport_7842_to_rails_3_2_stableRafael Mendonça França2012-11-083-1/+11
|\ \ \
| * | | backport, handle trailing slash with enginesYves Senn2012-11-083-1/+11
|/ / /