| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | ARes URL should be pointed to 3-2-stable tree not master. | Arun Agrawal | 2012-04-23 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #5896 from sferik/revert_5861 | Jeremy Kemper | 2012-04-21 | 2 | -4/+18 |
|\ \ \
| |/ /
|/| | |
|
| * | | Use `Object#respond_to?` to determine which MultiJson API to use | Erik Michaels-Ober | 2012-04-18 | 1 | -3/+17 |
| * | | Revert "multi_json is restricted to < 1.3 " | Erik Michaels-Ober | 2012-04-18 | 1 | -1/+1 |
* | | | Be sure to correctly fetch PK name from MySQL even if the PK has some custom ... | Akira Matsuda | 2012-04-19 | 2 | -1/+31 |
* | | | Merge pull request #5898 from benedikt/3-2-stable | Jeremy Kemper | 2012-04-19 | 6 | -8/+40 |
|\ \ \
| |/ /
|/| | |
|
| * | | Removes unneeded caching from ActiveRecord::Base.relation | Benedikt Deicke | 2012-04-19 | 1 | -4/+3 |
| * | | Revert "Revert "Fix #5667. Preloading should ignore scoping."" | Benedikt Deicke | 2012-04-19 | 2 | -2/+9 |
| * | | Adds test to check that circular preloading does not modify Model.unscoped (a... | Benedikt Deicke | 2012-04-19 | 3 | -4/+26 |
| * | | Removes caching from ActiveRecord::Core::ClassMethods#relation | Benedikt Deicke | 2012-04-19 | 2 | -2/+6 |
|/ / |
|
* | | Revert "Fix #5667. Preloading should ignore scoping." | Jeremy Kemper | 2012-04-18 | 3 | -20/+2 |
* | | Add hook for add_resource_route | Santiago Pastorino | 2012-04-18 | 4 | -7/+21 |
* | | Merge pull request #5894 from norman/3-2-fix-nil-logger | Aaron Patterson | 2012-04-18 | 1 | -1/+1 |
|\ \ |
|
| * | | Check for nil logger | Norman Clarke | 2012-04-18 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #5874 from asanghi/3-2-stable | Jeremy Kemper | 2012-04-17 | 4 | -5/+5 |
|\ \
| |/
|/| |
|
| * | Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ma... | Aditya Sanghi | 2012-04-17 | 4 | -5/+5 |
|/ |
|
* | Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable | Jeremy Kemper | 2012-04-16 | 1 | -1/+1 |
|\ |
|
| * | multi_json is restricted to < 1.3 | Arun Agrawal | 2012-04-16 | 1 | -1/+1 |
* | | Add missing require in Active Support time zones (fixes #5854) | Piotr Sarnacki | 2012-04-15 | 1 | -0/+1 |
|/ |
|
* | "rails new -h" shows message in rails directory | ask | 2012-04-13 | 2 | -3/+17 |
* | fix typo in readme [ci skip] | Vijay Dev | 2012-04-12 | 1 | -1/+1 |
* | Fix code example in generator test case | Prem Sichanugrist | 2012-04-12 | 1 | -2/+2 |
* | Merge pull request #5820 from arunagw/more_ruby-2-0-fixes | Jeremy Kemper | 2012-04-12 | 1 | -1/+9 |
|\ |
|
| * | test against ruby features in order to fix tests on Ruby 2.0 | Aaron Patterson | 2012-04-12 | 1 | -1/+9 |
|/ |
|
* | Merge pull request #5800 from arunagw/bigdecimal_dup | Jeremy Kemper | 2012-04-10 | 2 | -3/+24 |
|\ |
|
| * | probably should require the objects we monkey patch. | Aaron Patterson | 2012-04-10 | 1 | -0/+1 |
| * | bigdecimal can be duped on Ruby 2.0 | Aaron Patterson | 2012-04-10 | 2 | -2/+22 |
| * | add the class name to the assertion message | Aaron Patterson | 2012-04-10 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #5799 from arunagw/readme_fix | Vijay Dev | 2012-04-10 | 1 | -2/+2 |
|\ |
|
| * | README fix! [skip ci] | Arun Agrawal | 2012-04-10 | 1 | -2/+2 |
* | | Merge pull request #5725 from kevmoo/remove_unused_castcode | Xavier Noria | 2012-04-09 | 1 | -2/+0 |
|\ \ |
|
| * | | Remove unused 'cast_code' variable | Kevin Moore | 2012-04-03 | 1 | -2/+0 |
* | | | rewords the section about default_url_options in the Action Controller Overvi... | Xavier Noria | 2012-04-09 | 1 | -3/+4 |
| |/
|/| |
|
* | | Merge pull request #5784 from rafaelfranca/default_url-3-2 | Santiago Pastorino | 2012-04-08 | 3 | -4/+4 |
|\ \ |
|
| * | | Document that default_url_options must return a hash with symbolized | Rafael Mendonça França | 2012-04-09 | 1 | -0/+1 |
| * | | default_url_options does not receive one argument anymore | Rafael Mendonça França | 2012-04-08 | 3 | -4/+3 |
* | | | Fix 'Everyday Git' link | Anil Wadghule | 2012-04-07 | 1 | -1/+1 |
* | | | Merge pull request #5765 from anildigital/3-2-stable | Vijay Dev | 2012-04-06 | 1 | -4/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix Rails version in getting started guide. | Anil Wadghule | 2012-04-06 | 1 | -4/+4 |
|/ / |
|
* | | Merge pull request #5737 from rafaelfranca/3-2-stable | Santiago Pastorino | 2012-04-04 | 1 | -3/+1 |
|\ \ |
|
| * | | Fix tests of benchmark with silence equals to true | Rafael Mendonça França | 2012-04-04 | 1 | -3/+1 |
|/ / |
|
* | | Merge pull request #5188 from jlxw/patch-1 | Santiago Pastorino | 2012-04-04 | 1 | -1/+1 |
* | | Merge pull request #5727 from hone/ar_database_url_logging | Aaron Patterson | 2012-04-03 | 2 | -0/+66 |
|\ \
| |/
|/| |
|
| * | log which config format AR uses to connect with | Terence Lee | 2012-04-03 | 2 | -0/+23 |
| * | test initializer logic for DATABASE_URL env var | Terence Lee | 2012-04-03 | 1 | -0/+43 |
|/ |
|
* | DATABASE_URL allows omission of database.yml | Tim Pope | 2012-04-03 | 1 | -1/+3 |
* | Usage file in generators shouldn't be fetched only based on source_root | Piotr Sarnacki | 2012-04-02 | 3 | -5/+22 |
* | Fix the redirect when it receive blocks with arity of 1. | Rafael Mendonça França | 2012-03-31 | 2 | -1/+17 |
* | Merge pull request #5662 from arturopie/3-2_fixing_IM_when_using_find_select | Aaron Patterson | 2012-03-30 | 3 | -21/+29 |
|\ |
|
| * | refactor instantiate method in base, so we remove nesting if's which make the... | Arturo Pie | 2012-03-29 | 2 | -12/+19 |