aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
|\ \ \ \
| * | | | Backport #5808Mack Earnhardt2013-03-243-6/+60
|/ / / /
* | | | Merge pull request #9873 from senny/use_old_hash_syntaxJon Leighton2013-03-221-1/+1
|\ \ \ \
| * | | | use ruby 1.8 Hash syntax [ci skip]Yves Senn2013-03-221-1/+1
|/ / / /
* | | | Merge pull request #9870 from senny/9806_eager_loading_regressionJon Leighton2013-03-222-2/+8
|\ \ \ \
| * | | | do not reset associations when preloading twice.Yves Senn2013-03-222-2/+8
|/ / / /
* | | | Fix test to Ruby 1.8Rafael Mendonça França2013-03-211-1/+1
* | | | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-03-211-1/+5
* | | | Merge branch '3-2-stable' into fredwu-slow_view_loading_fixAaron Patterson2013-03-206-2/+32
|\ \ \ \
| * | | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-203-1/+18
| * | | | Remove bad changelog entry from AR [ci skip]Carlos Antonio da Silva2013-03-201-3/+0
| * | | | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-203-0/+16
| * | | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2013-03-201-1/+1
* | | | | Added changelog for 687e68dFred Wu2013-03-211-0/+6
* | | | | Fixed assets loading performance in 3.2.13Fred Wu2013-03-202-1/+10
|/ / / /
* | | | Be consistent with quotes in smtp example guide [ci skip]Carlos Antonio da Silva2013-03-191-1/+1
* | | | Merge pull request #9796 from dembskoi/clone_structureRafael Mendonça França2013-03-192-0/+8
|\ \ \ \
| * | | | Reset postgreSQL search path in db:test:clone_structure.Alexander2013-03-192-0/+8
* | | | | Merge pull request #9804 from samsonasu/backport_number_to_human_fixesRafael Mendonça França2013-03-193-1/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Backport #9347 to rails 3.2hoffm2013-03-193-1/+20
|/ / / /
* | | | Merge pull request #9789 from puma/3-2-stableJosé Valim2013-03-181-1/+1
|\ \ \ \
| * | | | Change @env_config to @app_env_configEvan Phoenix2013-03-181-1/+1
|/ / / /
* | | | Merge pull request #9785 from claudiob/add-3-2-13-release-date-to-changelogsRafael Mendonça França2013-03-187-8/+8
|\ \ \ \
| * | | | Add release dates to documentation [ci skip]claudiob2013-03-187-8/+8
|/ / / /
* | | | Bring back test and changelog entry from #pluck method and select clauseCarlos Antonio da Silva2013-03-182-0/+16
* | | | Fix method name indent [ci skip]Carlos Antonio da Silva2013-03-181-1/+1
* | | | Fix changelog conflicts and remove release dates [ci skip]Carlos Antonio da Silva2013-03-183-14/+8
* | | | Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-1828-50/+98
|\ \ \ \
| * | | | bumping to 3.2.13Aaron Patterson2013-03-189-9/+9