aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\
| * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
* | Add release date of 3.2.10Rafael Mendonça França2013-01-021-7/+6
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-233-2/+26
|\|
| * CVE-2012-5664 options hashes should only be extracted if there are extra para...Aaron Patterson2012-12-232-1/+18
| * updating changelogAaron Patterson2012-12-231-1/+2
| * updating the changelog for the CVEAaron Patterson2012-12-231-0/+4
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
* | Serialized attribute can be serialized in an integer columnRafael Mendonça França2012-12-215-6/+49
* | Backport #8522, Keep index names when using with sqlite3Yves Senn2012-12-193-1/+19
* | recognize migrations, in folders containing numbers and 'rb'.Yves Senn2012-12-134-1/+24
* | Improve test name related to cache timestamp format [ci skip]Carlos Antonio da Silva2012-12-111-1/+1
* | Add :nsec format only for Ruby 1.9Carlos Antonio da Silva2012-12-112-0/+5
* | Run backported serialized test without Identity MapCarlos Antonio da Silva2012-12-111-2/+4
* | Use 1.8 hash style :bomb:Carlos Antonio da Silva2012-12-111-2/+2
* | Merge pull request #8441 from itzki/fix_decorate_columnsCarlos Antonio da Silva2012-12-111-0/+13
* | Add CHANGELOG entry for #6376.Rafael Mendonça França2012-12-101-0/+4
* | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-104-2/+34
* | Make sure the tests pass in the case closer to described in #8195Rafael Mendonça França2012-12-104-19/+14
* | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-12-102-2/+2
* | Added regression test for #8195.jacobstr2012-12-101-0/+18
* | Remove warning of unused variableRafael Mendonça França2012-12-101-1/+1
* | Unscope update_column(s) query to ignore default scopeCarlos Antonio da Silva2012-12-063-1/+35
* | Merge pull request #8417 from kennyj/fix_8414Rafael Mendonça França2012-12-042-3/+8
* | backport #8403, no intermediate AR objects when eager loading.Yves Senn2012-12-044-2/+26
* | Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-12-033-1/+20
* | handled respond_to? with private methodsSHIBATA Hiroshi2012-12-031-1/+1
* | Make the CHANGELOG consistent [ci skip]Rafael Mendonça França2012-11-301-11/+20
* | Merge pull request #6397 from kennyj/fix_translate_exceptionAaron Patterson2012-11-302-3/+12
* | Backport 78b30fed9336336694fb2cb5d2825f95800b541c to fix non-utf-8 databases ...Jeremy Kemper2012-11-291-5/+19
* | Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fixAaron Patterson2012-11-282-9/+29
|\ \
| * | Making test accurately reflect what is going on in the schema migrations testChris Barton2012-09-182-9/+29
* | | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-11-281-0/+1
* | | Use 1.8 hash style in pg specific schemaCarlos Antonio da Silva2012-11-281-3/+3
* | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-261-1/+20
* | | schema cache already has the columns as a hash, so use thatAaron Patterson2012-11-251-1/+1
* | | speed up fixture loading by querying the schema cache for column namesAaron Patterson2012-11-251-1/+1
* | | Merge pull request #8311 from alisdair/dirty-nullable-datetimeCarlos Antonio da Silva2012-11-253-0/+21
* | | backport #8291, prevent mass assignment of polymorphic type with `build`Yves Senn2012-11-223-1/+15
* | | Merge pull request #8276 from pwnall/pgsql_text_limitsRafael Mendonça França2012-11-204-0/+35
* | | Be a bit less conservative with mysql in adapterCarlos Antonio da Silva2012-11-191-1/+1
* | | Merge pull request #8258 from kommen/eager_loading_with_select_test2Carlos Antonio da Silva2012-11-191-0/+14
* | | Merge pull request #7983 from georgebrock/bug7950-squashedCarlos Antonio da Silva2012-11-168-12/+48
|\ \ \
| * | | Test/changelog for has_many bug on unsaved recordsGeorge Brocklehurst2012-11-102-0/+13
| * | | use bind values for join columnsAaron Patterson2012-11-106-12/+36
* | | | fix testJon Leighton2012-11-131-3/+3
* | | | Merge pull request #8209 from senny/backport_8176Rafael Mendonça França2012-11-133-1/+18
|\ \ \ \
| * | | | backport #8176, `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-133-1/+18
* | | | | Merge pull request #8204 from nikitug/fix_dynamic_finder_result_checkRafael Mendonça França2012-11-134-2/+21
|\ \ \ \ \
| * | | | | Use nil? instead of blank? to check dynamic finder resultNikita Afanasenko2012-11-134-1/+17