aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Backport #8522, Keep index names when using with sqlite3Yves Senn2012-12-193-1/+19
* Use 1.8 style hash in json encoding testCarlos Antonio da Silva2012-12-141-1/+1
* Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-143-10/+24
* Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-142-14/+14
* Clear url helper methods when routes are reloadedAndrew White2012-12-144-6/+175
* Merge pull request #8504 from senny/backport_8492Carlos Antonio da Silva2012-12-134-1/+24
|\
| * recognize migrations, in folders containing numbers and 'rb'.Yves Senn2012-12-134-1/+24
|/
* Merge pull request #8490 from mattv/fix_request_raw_postRafael Mendonça França2012-12-113-2/+15
* 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-114-10/+16
* 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-105-2/+36
* 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-104-3/+6
* Added regression test for #8195.jacobstr2012-12-101-0/+18
* Remove warning of unused variableRafael Mendonça França2012-12-101-1/+1
* Merge pull request #8477 from senny/backport_8448Rafael Mendonça França2012-12-104-14/+43
|\
| * Backport #8450, the return value from mailer methods is not relevant.Yves Senn2012-12-104-4/+30
| * revised the actionmailer's CHANGELOG structureYves Senn2012-12-102-10/+13
|/
* 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
* Make distance_of_time_in_words work with DateTime offsetsAndrew White2012-12-042-2/+13
* Make output of distance_of_time_in_words consistentAndrew White2012-12-042-4/+21
* Merge pull request #8413 from senny/8403_backportRafael Mendonça França2012-12-044-2/+26
|\
| * backport #8403, no intermediate AR objects when eager loading.Yves Senn2012-12-044-2/+26
|/
* Bump mailer to quiet the stdout log messagesJeremy Kemper2012-12-041-1/+1
* Merge pull request #4942 from bogdan/pluck_joinsJosé Valim2012-12-033-1/+20
* Use send in Time marshal extensions since the methods are now privateCarlos Antonio da Silva2012-12-031-2/+2
* Skip ruby-prof in Gemfile for Ruby 2.0Carlos Antonio da Silva2012-12-031-1/+1
* Use 1.8 hash styleCarlos Antonio da Silva2012-12-031-1/+1
* Override <%== to always behave as literal text rather than toggling based on ...Jeremy Kemper2012-12-033-4/+21
* Merge pull request #8405 from hsbt/fix-respond-initialize-dupCarlos Antonio da Silva2012-12-033-3/+3
|\
| * handled respond_to? with private methodsSHIBATA Hiroshi2012-12-033-3/+3
|/
* Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia...Rafael Mendonça França2012-12-023-2/+17
* Use 1.8 hash style in xml serialization testCarlos Antonio da Silva2012-11-301-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
* Merge pull request #8380 from route/fix-concern-descriptionXavier Noria2012-11-301-1/+3
|\
| * Fixed description for ActiveSupport::Concern typical caseDmitry Vorotilin2012-11-301-1/+3
|/
* Backport 78b30fed9336336694fb2cb5d2825f95800b541c to fix non-utf-8 databases ...Jeremy Kemper2012-11-291-5/+19
* Merge pull request #8352 from steveklabnik/update_7858Rafael Mendonça França2012-11-293-3/+21
* 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
* | Merge pull request #8327 from elia/fix-send-data-disposition-with-symbolsCarlos Antonio da Silva2012-11-283-2/+16
|\ \
| * | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-2/+16
* | | 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
|/ /