aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-123-1/+12
* Revert "Don't try to EXPLAIN select_db calls"Xavier Noria2013-05-112-8/+1
* So not make Fixnum#/ private on Ruby verions less than 1.9.3Rafael Mendonça França2013-05-101-4/+3
* Fix test to ruby 2.0Rafael Mendonça França2013-05-101-2/+9
* Merge pull request #10557 from arunagw/pluck-refactor-using-mapAndrew White2013-05-101-1/+1
|\
| * Using map. No need to run query againArun Agrawal2013-05-101-1/+1
|/
* Merge pull request #10555 from dasch/dasch/3-2-stableXavier Noria2013-05-102-1/+8
|\
| * Don't try to EXPLAIN select_db callsDaniel Schierbeck2013-05-102-1/+8
* | Merge pull request #10552 from arunagw/pluck-fixed-3-2-stableRafael Mendonça França2013-05-102-6/+7
|\ \
| * | Fixed pluck to be working with selects.Arun Agrawal2013-05-102-3/+7
| * | Remove useless elseArun Agrawal2013-05-101-3/+0
|/ /
* | Revert "Merge pull request #8209 from senny/backport_8176"Rafael Mendonça França2013-05-083-6/+11
* | Revert "Remove unicode character encoding from ActiveSupport::JSON.encode"Rafael Mendonça França2013-05-083-23/+23
* | Merge pull request #10496 from arunagw/build-fix-scaffold-generatorCarlos Antonio da Silva2013-05-071-1/+1
|\ \
| * | Build fix for scaffold generator Arun Agrawal2013-05-071-1/+1
|/ /
* | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroyRafael Mendonça França2013-05-063-1/+28
* | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
* | Merge pull request #10406 from greenriver/distance_of_time_rationalRafael Mendonça França2013-05-062-1/+6
|\ \
| * | Merging in fix from #8222Ben Tucker2013-05-062-1/+6
| |/
* | Merge pull request #10466 from prathamesh-sonpatki/scaffold-assetsCarlos Antonio da Silva2013-05-051-4/+4
* | Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-masterRafael Mendonça França2013-05-043-1/+20
|/
* adding test for the symbol refsAaron Patterson2013-04-261-0/+7
* just clear the caches on clear! rather than replacing. fixes #10251Aaron Patterson2013-04-171-8/+4
* adding a test for root path in the appAaron Patterson2013-04-171-0/+24
* Merge pull request #10246 from prathamesh-sonpatki/3.2.13-https-rubygemsCarlos Antonio da Silva2013-04-171-1/+1
|\
| * Use secure source in generated Gemfile for creating new plugin. Closes #10245Prathamesh Sonpatki2013-04-171-1/+1
* | Fix "Scaling Rails Screencasts" link in caching guideCarlos Antonio da Silva2013-04-161-1/+1
|/
* Merge pull request #9688 from alexeymuranov/doc-nested-attributes-3-2Carlos Antonio da Silva2013-04-131-17/+41
|\
| * Document nested attributes as hash of hashesAlexey Muranov2013-04-131-17/+41
|/
* Merge pull request #10172 from senny/10098_backportRafael Mendonça França2013-04-114-1/+13
|\
| * Correctly parse bigint defaults in PostgreSQL, Backpost #10098.Erik Peterson2013-04-114-1/+13
|/
* Merge branch '3-2-later' into 3-2-stableAaron Patterson2013-04-091-0/+10
|\
| * adding test for CVEAaron Patterson2013-02-091-0/+10
* | Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
* | Merge pull request #10105 from rmm5t/fix-explicit-name-on-multiple-fieldsRafael Mendonça França2013-04-053-8/+24
|\ \
| * | Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
|/ /
* | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
* | Use 1.8 hash style in test viewsCarlos Antonio da Silva2013-04-032-2/+2
* | Merge pull request #7792 from seejee/chained_scopes_preload_properlyCarlos Antonio da Silva2013-04-034-2/+22
|\ \
| * | Chained scopes will be preloaded properly. Fixes #7490Chris Geihsler2013-04-034-2/+22
* | | Common behavior with adding formats to lookup_context for TemplateRenderer an...Dmitry Vorotilin2013-04-0212-4/+33
* | | Fix formatting and minor review in AP changelogCarlos Antonio da Silva2013-03-301-9/+8
* | | Add attr_accessible to the Getting Started Guide.Steve Klabnik2013-03-291-0/+2
* | | Removing explain support warning from the RailtieRafael Mendonça França2013-03-282-7/+7
* | | Merge pull request #9943 from fredwu/test_fix_for_74e59eaCarlos Antonio da Silva2013-03-261-1/+1
|\ \ \
| * | | Fixed test failures on 1.8.7 caused by 74e59eaFred Wu2013-03-271-1/+1
|/ / /
* | | Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_col...Rafael Mendonça França2013-03-263-1/+18
|\ \ \
| * | | Added changelog for 55e2954Fred Wu2013-03-271-0/+5
| * | | Don't reset inheritance_column when setting explicitly.Fred Wu2013-03-272-1/+13
|/ / /
* | | Merge pull request #9899 from macksmind/backport_5808Jeremy Kemper2013-03-243-6/+60
|\ \ \