aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Unset association when existing record is destroyed.James Coleman2012-03-022-0/+17
* updates CHANGELOGs to register changes in 002713cXavier Noria2012-02-223-0/+21
* add some tests, yay!Aaron Patterson2012-02-221-0/+31
* Merge pull request #5133 from rafaelfranca/fix-buildAaron Patterson2012-02-221-1/+1
|\
| * Only set ActionView configuration inside the on_load blockRafael Mendonça França2012-02-221-1/+1
|/
* Merge pull request #5132 from rafaelfranca/fix-buildAaron Patterson2012-02-221-2/+2
|\
| * Fix routes inspection orderRafael Mendonça França2012-02-221-2/+2
* | Merge pull request #5119 from kennyj/fix_5114Aaron Patterson2012-02-221-0/+26
|\ \ | |/ |/|
| * Testcase for GH #5114.kennyj2012-02-221-0/+26
* | Merge pull request #5130 from dlee/revised_patch_verbXavier Noria2012-02-2240-151/+402
|\ \
| * | Add config.default_method_for_update to support PATCHDavid Lee2012-02-2240-151/+402
* | | Merge pull request #5128 from bogdan/deprecate_rescuableJosé Valim2012-02-224-37/+13
|\ \ \
| * | | AS::Callbacks: deprecate rescuable optionBogdan Gusiev2012-02-224-37/+13
|/ / /
* | | format lookup for partials is derived from the format in which the template i...Santiago Pastorino2012-02-2211-36/+25
* | | Merge pull request #5124 from bquorning/prefer-||-over-'or'-for-boolean-opera...José Valim2012-02-221-1/+1
|\ \ \ | |/ / |/| |
| * | Prefer || over 'or' for boolean operationsBenjamin Quorning2012-02-221-1/+1
|/ /
* | bumping up arelAaron Patterson2012-02-211-1/+1
* | prepared statements can be disabledAaron Patterson2012-02-218-30/+56
* | Merge pull request #5118 from castlerock/ordered_options_from_hashSantiago Pastorino2012-02-211-3/+1
|\ \
| * | ordered_options will work if inherited from Hash, remove OrderedHash usageVishnu Atrai2012-02-211-3/+1
* | | more ruby 2.0 respond_to? changesAaron Patterson2012-02-211-1/+1
* | | ruby 2.0 makes protected methods return false for respond_to, so pass true as...Aaron Patterson2012-02-211-1/+1
* | | fix bad docs from f373f296 [ci skip]Vijay Dev2012-02-211-3/+3
* | | Don't wrap the raise with ensureSantiago Pastorino2012-02-212-10/+12
|/ /
* | Merge pull request #5108 from mirakui/patch-1Aaron Patterson2012-02-211-1/+1
|\ \
| * | Bug: cache_path.size doesn't return length of filename but size of file if ca...Issei Naruta2012-02-211-1/+1
* | | Merge pull request #5116 from rubenfonseca/delete_with_block_refactorAaron Patterson2012-02-212-2/+2
|\ \ \
| * | | Refactored two methods to use delete with a blockRuben Fonseca2012-02-212-2/+2
|/ / /
* | / Restore lookup formats to the previous value after searching for the failing ...Santiago Pastorino2012-02-212-2/+5
| |/ |/|
* | Merge pull request #5112 from nupurjain/activesupport_cache_refactorSantiago Pastorino2012-02-211-5/+1
|\ \ | |/ |/|
| * suggested changes.Nupur Jain2012-02-211-5/+1
* | Merge pull request #5107 from rubenfonseca/stylesheet_link_tag_refactorJon Leighton2012-02-211-3/+3
|\ \
| * | use Hash#delete on styelsheet_link_tagRuben Fonseca2012-02-211-3/+3
|/ /
* | Merge pull request #5033 from markmcspadden/inherited_headersJeremy Kemper2012-02-202-0/+41
|\ \
| * | Remove double test for header inheritance leaksMark McSpadden2012-02-141-11/+0
| * | Allow ActiveResource subclasses to inherit headers from parentMark McSpadden2012-02-132-0/+52
* | | tag bind params with a bind param objectAaron Patterson2012-02-203-3/+3
* | | use Hash#delete with a default blockAaron Patterson2012-02-201-3/+3
* | | Merge pull request #5102 from nashby/form-option-refactorJosé Valim2012-02-202-28/+29
|\ \ \
| * | | refactor options_for_selectVasiliy Ermolovich2012-02-202-23/+24
| * | | refactor grouped_options_for_selectVasiliy Ermolovich2012-02-201-5/+5
* | | | Fix a failing testSantiago Pastorino2012-02-201-0/+2
* | | | Use the right format when a partial is missing.Santiago Pastorino2012-02-203-0/+9
* | | | Merge pull request #5101 from ckdake/ckdake_actionview_handler_resetJosé Valim2012-02-202-0/+7
* | | | search private / protected methods in trunk rubyAaron Patterson2012-02-201-1/+1
|/ / /
* | | Merge pull request #5082 from willbryant/assigns_should_not_stringify_values_...Aaron Patterson2012-02-202-1/+7
|\ \ \
| * | | assigns(:foo) should not convert @foo's keys to strings if it happens to be a...Will Bryant2012-02-182-1/+7
* | | | Merge pull request #5096 from lawso017/masterAaron Patterson2012-02-202-19/+43
|\ \ \ \
| * | | | removed commented line. 3434 tests, 10531 assertions, 0 failures, 0 errors, 3...William Lawson2012-02-201-1/+0
| * | | | Restored ability to identify ID and Sequence from tables relying on a nonmatc...William Lawson2012-02-202-19/+44