aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ARes URL should be pointed to 3-2-stable tree not master.Arun Agrawal2012-04-231-1/+1
* Merge pull request #5896 from sferik/revert_5861Jeremy Kemper2012-04-212-4/+18
|\
| * Use `Object#respond_to?` to determine which MultiJson API to useErik Michaels-Ober2012-04-181-3/+17
| * Revert "multi_json is restricted to < 1.3 "Erik Michaels-Ober2012-04-181-1/+1
* | Be sure to correctly fetch PK name from MySQL even if the PK has some custom ...Akira Matsuda2012-04-192-1/+31
* | Merge pull request #5898 from benedikt/3-2-stableJeremy Kemper2012-04-196-8/+40
|\ \ | |/ |/|
| * Removes unneeded caching from ActiveRecord::Base.relationBenedikt Deicke2012-04-191-4/+3
| * Revert "Revert "Fix #5667. Preloading should ignore scoping.""Benedikt Deicke2012-04-192-2/+9
| * Adds test to check that circular preloading does not modify Model.unscoped (a...Benedikt Deicke2012-04-193-4/+26
| * Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-192-2/+6
|/
* Revert "Fix #5667. Preloading should ignore scoping."Jeremy Kemper2012-04-183-20/+2
* Add hook for add_resource_routeSantiago Pastorino2012-04-184-7/+21
* Merge pull request #5894 from norman/3-2-fix-nil-loggerAaron Patterson2012-04-181-1/+1
|\
| * Check for nil loggerNorman Clarke2012-04-181-1/+1
|/
* Merge pull request #5874 from asanghi/3-2-stableJeremy Kemper2012-04-174-5/+5
|\
| * Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ma...Aditya Sanghi2012-04-174-5/+5
|/
* Merge pull request #5861 from arunagw/multi_json_fix_3-2-stableJeremy Kemper2012-04-161-1/+1
|\
| * multi_json is restricted to < 1.3 Arun Agrawal2012-04-161-1/+1
* | Add missing require in Active Support time zones (fixes #5854)Piotr Sarnacki2012-04-151-0/+1
|/
* "rails new -h" shows message in rails directoryask2012-04-132-3/+17
* fix typo in readme [ci skip]Vijay Dev2012-04-121-1/+1
* Fix code example in generator test casePrem Sichanugrist2012-04-121-2/+2
* Merge pull request #5820 from arunagw/more_ruby-2-0-fixesJeremy Kemper2012-04-121-1/+9
|\
| * test against ruby features in order to fix tests on Ruby 2.0Aaron Patterson2012-04-121-1/+9
|/
* Merge pull request #5800 from arunagw/bigdecimal_dupJeremy Kemper2012-04-102-3/+24
|\
| * probably should require the objects we monkey patch.Aaron Patterson2012-04-101-0/+1
| * bigdecimal can be duped on Ruby 2.0Aaron Patterson2012-04-102-2/+22
| * add the class name to the assertion messageAaron Patterson2012-04-101-1/+1
|/
* Merge pull request #5799 from arunagw/readme_fixVijay Dev2012-04-101-2/+2
|\
| * README fix! [skip ci]Arun Agrawal2012-04-101-2/+2
* | Merge pull request #5725 from kevmoo/remove_unused_castcodeXavier Noria2012-04-091-2/+0
|\ \
| * | Remove unused 'cast_code' variableKevin Moore2012-04-031-2/+0
* | | rewords the section about default_url_options in the Action Controller Overvi...Xavier Noria2012-04-091-3/+4
| |/ |/|
* | Merge pull request #5784 from rafaelfranca/default_url-3-2Santiago Pastorino2012-04-083-4/+4
|\ \
| * | Document that default_url_options must return a hash with symbolizedRafael Mendonça França2012-04-091-0/+1
| * | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-083-4/+3
* | | Fix 'Everyday Git' linkAnil Wadghule2012-04-071-1/+1
* | | Merge pull request #5765 from anildigital/3-2-stableVijay Dev2012-04-061-4/+4
|\ \ \ | |/ / |/| |
| * | Fix Rails version in getting started guide.Anil Wadghule2012-04-061-4/+4
|/ /
* | Merge pull request #5737 from rafaelfranca/3-2-stableSantiago Pastorino2012-04-041-3/+1
|\ \
| * | Fix tests of benchmark with silence equals to trueRafael Mendonça França2012-04-041-3/+1
|/ /
* | Merge pull request #5188 from jlxw/patch-1Santiago Pastorino2012-04-041-1/+1
* | Merge pull request #5727 from hone/ar_database_url_loggingAaron Patterson2012-04-032-0/+66
|\ \ | |/ |/|
| * log which config format AR uses to connect withTerence Lee2012-04-032-0/+23
| * test initializer logic for DATABASE_URL env varTerence Lee2012-04-031-0/+43
|/
* DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
* Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-023-5/+22
* 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