aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Use Ruby 1.8 hash syntaxCarlos Antonio da Silva2012-08-212-3/+3
* Use a model without counter cache to test read-only attributesRafael Mendonça França2012-08-211-9/+10
* Merge pull request #5210 from Pliny/masteriRafael Mendonça França2012-08-218-2/+36
* Merge pull request #7410 from sandeepravi/default_options_helper_valueRafael Mendonça França2012-08-213-0/+18
* Merge pull request #6986 from kennyj/fix_6975Rafael Mendonça França2012-08-213-5/+34
* Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_las...Carlos Antonio da Silva2012-08-213-1/+11
* Merge pull request #7388 from ManageIQ/fix_table_remove_passing_array_depreca...Rafael Mendonça França2012-08-182-3/+3
|\
| * Table#remove passed an array to remove_column, which is deprecated.Joe Rafaniello2012-08-182-3/+3
* | Ruby 1.8 doesn't have to_r defined to NilClass and Float.Rafael Mendonça França2012-08-181-5/+14
|/
* Merge pull request #7352 from aripollak/microsecond-timestampRafael Mendonça França2012-08-174-3/+10
* Increase benchmark time to 20 seconds.Jon Leighton2012-08-171-18/+18
* Use benchmark/ips to measure AR performanceJon Leighton2012-08-172-39/+36
* Remove duplicated changelog entry [ci skip]Carlos Antonio da Silva2012-08-151-6/+0
* Merge pull request #7027 from erichmenge/patch/jruby_send_fileCarlos Antonio da Silva2012-08-152-2/+28
|\
| * Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the ...Jeremy Kemper2012-08-152-2/+28
* | Do not use update_column where update_attribute is not interchangeableRafael Mendonça França2012-08-158-39/+32
|/
* Merge pull request #6073 from daveyeu/restore-state-on-record-invalidRafael Mendonça França2012-08-113-1/+23
* Merge pull request #7316 from brainopia/backport_fix_session_store_optionsRafael Mendonça França2012-08-115-5/+38
|\
| * Update changelog to reflect support of cookie jar options for allbrainopia2012-08-111-0/+5
| * Test actual content of permanent cookiebrainopia2012-08-101-1/+1
| * Dont stream back cookie value if it was set to the same valuebrainopia2012-08-102-5/+19
| * Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_dom...brainopia2012-08-102-0/+14
* | [guides] Add info about CHANGELOGs to contributing guidePiotr Sarnacki2012-08-111-0/+25
* | Add CHANGELOG entry for #7286Rafael Mendonça França2012-08-101-0/+5
* | Merge pull request #7286 from kennyj/fix_7191Rafael Mendonça França2012-08-102-13/+28
|/
* Merge pull request #7309 from amerine/3-2-stableSantiago Pastorino2012-08-091-0/+2
|\
| * Add html_escape note to CHANGELOGMark Turner2012-08-091-0/+2
|/
* Merge branch '3-2-8' into 3-2-stableSantiago Pastorino2012-08-0920-21/+49
|\
| * Bump to 3.2.8Santiago Pastorino2012-08-099-9/+9