aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #7684 from jrochkind/connection_pool_timeout_key_backportRafael Mendonça França2012-09-254-5/+39
|\ \
| * | ConnectionPool accepts spec key 'checkout_timeout'Jonathan Rochkind2012-09-244-5/+39
* | | Fix invalid ruby 1.8 syntaxRafael Mendonça França2012-09-211-4/+5
|/ /
* | Merge pull request #7723 from steveklabnik/backport_3554Rafael Mendonça França2012-09-214-5/+23
|\ \
| * | Merge pull request #3544 from amatsuda/_field_changedAaron Patterson2012-09-214-5/+23
|/ /
* | Revert "Revert "Respect `config.digest = false` for `asset_path`""Rafael Mendonça França2012-09-203-1/+20
* | Explictly set the assets digest option to falseRafael Mendonça França2012-09-201-2/+5
* | Revert "Respect `config.digest = false` for `asset_path`"Rafael Mendonça França2012-09-203-20/+1
* | Revert "backport fair connection pool 02b2335563 to 3-2-stable"Rafael Mendonça França2012-09-207-311/+51
* | Merge pull request #7718 from kennyj/fix_6962-32Rafael Mendonça França2012-09-203-1/+16
|\ \
| * | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for...kennyj2012-09-203-1/+16
|/ /
* | Load the environment after creating the databaseJeremy Kemper2012-09-191-2/+2
* | Merge pull request #7668 from Draiken/fix_issue_6497Rafael Mendonça França2012-09-193-1/+18
* | Cache columns metadata to avoid extra while testingRafael Mendonça França2012-09-183-1/+11
* | Merge pull request #7686 from steveklabnik/add_upgrade_noteRafael Mendonça França2012-09-181-0/+122
|\ \
| * | Add upgrading note to 3.1 release notes.Steve Klabnik2012-09-181-0/+122
|/ /
* | Merge pull request #7672 from wagenet/asset_path_digest_fixRafael Mendonça França2012-09-183-1/+20
|\ \
| * | Respect `config.digest = false` for `asset_path`Peter Wagenet2012-09-173-1/+20
|/ /
* | Merge pull request #7675 from jrochkind/fair_conn_pool_backportRafael Mendonça França2012-09-174-50/+300
|\ \
| * | backport fair connection pool 02b2335563 to 3-2-stableJonathan Rochkind2012-09-174-50/+300
|/ /
* | log 404 status when ActiveRecord::RecordNotFound was raised (#7646)Yves Senn2012-09-174-3/+27
* | Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-173-0/+25
* | Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b2383...Rafael Mendonça França2012-09-171-1/+1
* | Merge pull request #7651 from steveklabnik/issue_3956Rafael Mendonça França2012-09-162-2/+32
* | Backport explain fixes.Rafael Mendonça França2012-09-165-13/+27
* | `skip` in Ruby 1.8 doesn't skip the test case without returnRafael Mendonça França2012-09-131-1/+1
* | Merge pull request #7633 from frodsan/patch-5Carlos Antonio da Silva2012-09-131-1/+1
|\ \
| * | fix markdown markup in AR/CHANGELOGFrancesco Rodríguez2012-09-131-1/+1
|/ /
* | Merge pull request #7632 from stevecj/3-2-stableRafael Mendonça França2012-09-134-0/+82
|\ \
| * | Backport PostgreSQL auto-reconnect test coverageSteve Jorgensen2012-09-134-0/+82
|/ /
* | Merge pull request #7603 from kennyj/fix_charset_vs_encoding_32Rafael Mendonça França2012-09-122-3/+9
|\ \
| * | Backported #7572 to 3-2-stable. Use config['encoding'], because database conf...kennyj2012-09-122-3/+9
|/ /
* | Merge pull request #7582 from tchandy/fix_type_cast_codeRafael Mendonça França2012-09-094-2/+36
|\ \
| * | ConnectionAdapters::Column.type_cast_code should always convert values to int...Thiago Pradi2012-09-094-2/+36
* | | Fix AS tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-2/+2
* | | Fix AR tests due to builder change with nil values / empty stringsCarlos Antonio da Silva2012-09-071-6/+6
* | | Update Active Model xml serialization test to reflect a change in builderCarlos Antonio da Silva2012-09-072-1/+14
* | | Merge pull request #7337 from adzap/string_to_dummy_timeRafael Mendonça França2012-09-053-1/+23
| |/ |/|
* | Merge pull request #7514 from senny/issue_7503_3_2_stableRafael Mendonça França2012-09-036-2/+42
|\ \ | |/ |/|
| * set the configured #inheritance_column on #become (#7503)Yves Senn2012-09-036-2/+42
|/
* documents after_(commit|rollback)Xavier Noria2012-08-301-0/+18
* Merge pull request #7474 from steveklabnik/backport_89ebd28Piotr Sarnacki2012-08-292-1/+8
|\
| * Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-08-282-1/+8
|/
* Ensure association preloading properly merges default scope and association c...Pratik Naik2012-08-284-3/+25
* CHANGELOGs are now per branchXavier Noria2012-08-286-16740/+6
* fixes a bug in dependencies.rbXavier Noria2012-08-281-1/+1
* Merge pull request #7446 from nashby/backport-fix-issue-7431Rafael Mendonça França2012-08-253-2/+34
|\
| * correct handling of date selects when using both disabled and discard optionsVasiliy Ermolovich2012-08-253-2/+34
|/
* Merge pull request #7438 from arunagw/3-2-stable-edge-rails-fixSantiago Pastorino2012-08-242-3/+4
|\
| * We need to have 1-0-stable for joureny gem in edgeArun Agrawal2012-08-242-3/+4
|/