| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | Merge pull request #3544 from amatsuda/_field_changed | Aaron Patterson | 2012-09-21 | 4 | -5/+23 |
|/ / / |
|
* | | | Revert "Revert "Respect `config.digest = false` for `asset_path`"" | Rafael Mendonça França | 2012-09-20 | 3 | -1/+20 |
* | | | Explictly set the assets digest option to false | Rafael Mendonça França | 2012-09-20 | 1 | -2/+5 |
* | | | Revert "Respect `config.digest = false` for `asset_path`" | Rafael Mendonça França | 2012-09-20 | 3 | -20/+1 |
* | | | Revert "backport fair connection pool 02b2335563 to 3-2-stable" | Rafael Mendonça França | 2012-09-20 | 7 | -311/+51 |
* | | | Merge pull request #7718 from kennyj/fix_6962-32 | Rafael Mendonça França | 2012-09-20 | 3 | -1/+16 |
|\ \ \ |
|
| * | | | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for... | kennyj | 2012-09-20 | 3 | -1/+16 |
|/ / / |
|
* | | | Load the environment after creating the database | Jeremy Kemper | 2012-09-19 | 1 | -2/+2 |
* | | | Merge pull request #7668 from Draiken/fix_issue_6497 | Rafael Mendonça França | 2012-09-19 | 3 | -1/+18 |
* | | | Cache columns metadata to avoid extra while testing | Rafael Mendonça França | 2012-09-18 | 3 | -1/+11 |
| |/
|/| |
|
* | | Merge pull request #7686 from steveklabnik/add_upgrade_note | Rafael Mendonça França | 2012-09-18 | 1 | -0/+122 |
|\ \ |
|
| * | | Add upgrading note to 3.1 release notes. | Steve Klabnik | 2012-09-18 | 1 | -0/+122 |
|/ / |
|
* | | Merge pull request #7672 from wagenet/asset_path_digest_fix | Rafael Mendonça França | 2012-09-18 | 3 | -1/+20 |
|\ \ |
|
| * | | Respect `config.digest = false` for `asset_path` | Peter Wagenet | 2012-09-17 | 3 | -1/+20 |
|/ / |
|
* | | Merge pull request #7675 from jrochkind/fair_conn_pool_backport | Rafael Mendonça França | 2012-09-17 | 4 | -50/+300 |
|\ \ |
|
| * | | backport fair connection pool 02b2335563 to 3-2-stable | Jonathan Rochkind | 2012-09-17 | 4 | -50/+300 |
|/ / |
|
* | | log 404 status when ActiveRecord::RecordNotFound was raised (#7646) | Yves Senn | 2012-09-17 | 4 | -3/+27 |
* | | Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt | Rafael Mendonça França | 2012-09-17 | 3 | -0/+25 |
* | | Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b2383... | Rafael Mendonça França | 2012-09-17 | 1 | -1/+1 |
* | | Merge pull request #7651 from steveklabnik/issue_3956 | Rafael Mendonça França | 2012-09-16 | 2 | -2/+32 |
* | | Backport explain fixes. | Rafael Mendonça França | 2012-09-16 | 5 | -13/+27 |
* | | `skip` in Ruby 1.8 doesn't skip the test case without return | Rafael Mendonça França | 2012-09-13 | 1 | -1/+1 |
* | | Merge pull request #7633 from frodsan/patch-5 | Carlos Antonio da Silva | 2012-09-13 | 1 | -1/+1 |
|\ \ |
|
| * | | fix markdown markup in AR/CHANGELOG | Francesco Rodríguez | 2012-09-13 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #7632 from stevecj/3-2-stable | Rafael Mendonça França | 2012-09-13 | 4 | -0/+82 |
|\ \ |
|
| * | | Backport PostgreSQL auto-reconnect test coverage | Steve Jorgensen | 2012-09-13 | 4 | -0/+82 |
|/ / |
|
* | | Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32 | Rafael Mendonça França | 2012-09-12 | 2 | -3/+9 |
|\ \ |
|
| * | | Backported #7572 to 3-2-stable. Use config['encoding'], because database conf... | kennyj | 2012-09-12 | 2 | -3/+9 |
|/ / |
|
* | | Merge pull request #7582 from tchandy/fix_type_cast_code | Rafael Mendonça França | 2012-09-09 | 4 | -2/+36 |
|\ \ |
|
| * | | ConnectionAdapters::Column.type_cast_code should always convert values to int... | Thiago Pradi | 2012-09-09 | 4 | -2/+36 |
* | | | Fix AS tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -2/+2 |
* | | | Fix AR tests due to builder change with nil values / empty strings | Carlos Antonio da Silva | 2012-09-07 | 1 | -6/+6 |
* | | | Update Active Model xml serialization test to reflect a change in builder | Carlos Antonio da Silva | 2012-09-07 | 2 | -1/+14 |
* | | | Merge pull request #7337 from adzap/string_to_dummy_time | Rafael Mendonça França | 2012-09-05 | 3 | -1/+23 |
| |/
|/| |
|
* | | Merge pull request #7514 from senny/issue_7503_3_2_stable | Rafael Mendonça França | 2012-09-03 | 6 | -2/+42 |
|\ \
| |/
|/| |
|
| * | set the configured #inheritance_column on #become (#7503) | Yves Senn | 2012-09-03 | 6 | -2/+42 |
|/ |
|
* | documents after_(commit|rollback) | Xavier Noria | 2012-08-30 | 1 | -0/+18 |
* | Merge pull request #7474 from steveklabnik/backport_89ebd28 | Piotr Sarnacki | 2012-08-29 | 2 | -1/+8 |
|\ |
|
| * | Fix bug when Rails.application is defined but is nil. See #881 | Marc-Andre Lafortune | 2012-08-28 | 2 | -1/+8 |
|/ |
|
* | Ensure association preloading properly merges default scope and association c... | Pratik Naik | 2012-08-28 | 4 | -3/+25 |
* | CHANGELOGs are now per branch | Xavier Noria | 2012-08-28 | 6 | -16740/+6 |
* | fixes a bug in dependencies.rb | Xavier Noria | 2012-08-28 | 1 | -1/+1 |
* | Merge pull request #7446 from nashby/backport-fix-issue-7431 | Rafael Mendonça França | 2012-08-25 | 3 | -2/+34 |
|\ |
|
| * | correct handling of date selects when using both disabled and discard options | Vasiliy Ermolovich | 2012-08-25 | 3 | -2/+34 |
|/ |
|
* | Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fix | Santiago Pastorino | 2012-08-24 | 2 | -3/+4 |
|\ |
|
| * | We need to have 1-0-stable for joureny gem in edge | Arun Agrawal | 2012-08-24 | 2 | -3/+4 |
|/ |
|
* | Use Ruby 1.8 hash syntax | Carlos Antonio da Silva | 2012-08-21 | 2 | -3/+3 |
* | Use a model without counter cache to test read-only attributes | Rafael Mendonça França | 2012-08-21 | 1 | -9/+10 |
* | Merge pull request #5210 from Pliny/masteri | Rafael Mendonça França | 2012-08-21 | 8 | -2/+36 |
* | Merge pull request #7410 from sandeepravi/default_options_helper_value | Rafael Mendonça França | 2012-08-21 | 3 | -0/+18 |