aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14431 from chancancode/warn_about_json_cookie_jarsGuillermo Iguaran2014-03-192-0/+48
|\
| * Added a warning about serializing data with JSON cookie jars [skip ci]Godfrey Chan2014-03-192-0/+48
|/
* Merge pull request #14429 from chriskohlbrenner/fix_typo_ar_querying_guideArthur Nogueira Neves2014-03-191-1/+1
|\
| * Fix a typo to make clause plural [ci skip]chriskohlbrenner2014-03-191-1/+1
|/
* Merge pull request #14421 from davidpdrsn/reorder-conditionalsRafael Mendonça França2014-03-181-10/+10
|\
| * Reorder conditional logicDavid Pedersen2014-03-181-10/+10
|/
* Merge pull request #14413 from arthurnn/port_test_ccGodfrey Chan2014-03-181-0/+11
|\
| * Add counter cache test for class_nameArthur Neves2014-03-171-0/+11
|/
* test should only pass if the pool.size+1 checkout failsAaron Patterson2014-03-171-3/+2
* use a latch to avoid busy loopsAaron Patterson2014-03-171-3/+4
* Merge pull request #14360 from matthewd/thread_aware_reaperAaron Patterson2014-03-178-69/+103
|\
| * Reap connections based on owning-thread deathMatthew Draper2014-03-187-68/+66
| * Teach PostgreSQLAdapter#reset! to actually resetMatthew Draper2014-03-182-1/+37
|/
* Merge pull request #14379 from robertomiranda/rake-notes.configGuillermo Iguaran2014-03-176-30/+81
|\
| * Rake notes should picked up new Extensions registered in the config/applicati...robertomiranda2014-03-171-3/+19
| * Update command line guiderobertomiranda2014-03-171-1/+7
| * Add Changelog Entry ref #14379robertomiranda2014-03-171-0/+8
| * Add config.annotations, in order to register new extensions for Rake notes at...robertomiranda2014-03-162-0/+14
| * Fix Shadowing extensions variable in Register Annotation Exentsionsrobertomiranda2014-03-162-7/+7
| * Supporting .ruby, .yml and .yaml Extension in Rake Notesrobertomiranda2014-03-142-2/+7
| * Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we have...robertomiranda2014-03-142-17/+5
| * Add Public Api for register new extensions for Rake Notesrobertomiranda2014-03-142-15/+29
* | Merge pull request #14090 from Fortisque/kevin/stream_error_in_main_thread_if...Aaron Patterson2014-03-172-10/+30
|\ \
| * | re-raise error if error occurs before committing in streamingKevin Casey2014-03-142-10/+30
* | | `where.not` adds `references` for `includes`.Yves Senn2014-03-174-0/+26
* | | fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`.Yves Senn2014-03-174-2/+14
* | | format ActiveRecord CHANGELOG. [ci skip]Yves Senn2014-03-171-8/+9
* | | Fix assertionsCarlos Antonio da Silva2014-03-161-2/+2
* | | Add an explicit require for 4ece124396669d3580e7f229ab407a0d4882727a rather t...Jeremy Kemper2014-03-161-0/+1
* | | Avoid concurrent test collision on the same memcache server by namespacing keysJeremy Kemper2014-03-161-1/+1
* | | Use nested_scope? not shallow? to determine whether to copy optionsAndrew White2014-03-163-1/+49
* | | Remove extra white-spaces [ci skip]Robin Dupret2014-03-161-13/+13
* | | Let COMMAND_WHITELIST be an Array, not a StringAkira Matsuda2014-03-161-1/+1
* | | Merge pull request #14399 from genericsteele/fixture-label-string-interpolationJeremy Kemper2014-03-154-1/+19
|\ \ \
| * | | Extend fixture label replacement to allow string interpolationEric Steele2014-03-154-1/+19
|/ / /
* | | Merge pull request #14396 from afshinator/masterJeremy Kemper2014-03-151-11/+28
|\ \ \
| * | | Reword 5.6 strong parameters and private method stuff [ci skip]Afshin Mokhtari2014-03-151-11/+28
* | | | Merge pull request #14395 from arthurnn/fix_mailer_preview_testJeremy Kemper2014-03-151-4/+4
|\ \ \ \
| * | | | Fix MailerPreview broken testsArthur Neves2014-03-151-4/+4
* | | | | Merge pull request #12662 from nashby/include-hidden-collectionRafael Mendonça França2014-03-153-3/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add include_hidden option to collection_check_boxes helperVasiliy Ermolovich2013-10-273-4/+19
* | | | | Merge pull request #14394 from zoltankiss/fix_typoArthur Neves2014-03-151-2/+1
|\ \ \ \ \
| * | | | | Minor grammer, code conventions fix [ci skip]Zoltan Kiss2014-03-151-2/+1
|/ / / / /
* | | | | Clarify AV::Digestor.digest method signature docs and deprecation warningJeremy Kemper2014-03-152-24/+23
* | | | | Remove deprecation on active_support/core_ext/class/attribute_accessors requi...Jeremy Kemper2014-03-151-5/+3
* | | | | Merge pull request #14380 from tgxworld/use_teardown_helper_method_in_activer...Yves Senn2014-03-1549-61/+51
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use teardown helper method.Guo Xiang Tan2014-03-1449-61/+51
| | |_|/ | |/| |
* | | | Obey `validate: false` option for habtmCarlos Antonio da Silva2014-03-144-1/+39
* | | | Merge pull request #14387 from huoxito/touch-api-docArthur Nogueira Neves2014-03-141-2/+2
|\ \ \ \
| * | | | Update callbacks executed on AR::Base#touch [skip ci]Washington Luiz2014-03-141-2/+2
| | |_|/ | |/| |