aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Merge pull request #9206 from ranjaykrishna/use_define_method""Jon Leighton2013-02-151-18/+13
* Revert "Merge pull request #9206 from ranjaykrishna/use_define_method"Jon Leighton2013-02-151-13/+18
* Merge pull request #9298 from wangjohn/add_documentation_to_migration_collisionJeremy Kemper2013-02-151-1/+1
|\
| * Added extra comment when a migration already exists of the same name.wangjohn2013-02-151-1/+1
|/
* Merge pull request #8704 from senny/remove_regexp_global_from_url_forAaron Patterson2013-02-142-2/+9
|\
| * replace regexp global in #url_forYves Senn2013-01-162-2/+9
* | Merge pull request #9252 from senny/8423_hmt_preloading_bugRafael Mendonça França2013-02-143-1/+30
|\ \
| * | don't cache invalid subsets when preloading hmt associations.Yves Senn2013-02-143-1/+30
* | | Merge pull request #9285 from rahul100885/masterGuillermo Iguaran2013-02-141-1/+1
|\ \ \
| * | | Bump rack-test dependency to 0.6.2Rahul P. Chaudhari2013-02-141-1/+1
| |/ /
* | | Merge pull request #9283 from rubys/masterCarlos Antonio da Silva2013-02-144-17/+12
|\ \ \ | |/ / |/| |
| * | Make valid_type? publicSam Ruby2013-02-144-17/+12
|/ /
* | Merge pull request #9254 from warnickr/9253_avoid_bigdecimal_performance_issueCarlos Antonio da Silva2013-02-131-4/+5
|\ \
| * | 9253: Before writing a numeric attribute value, ActiveRecord does an implicitRyan Warnick2013-02-131-4/+5
* | | Merge pull request #9115 from bensie/issue_5802Steve Klabnik2013-02-133-1/+36
|\ \ \
| * | | Don't call after_commit when creating through an association and save fails, ...James Miller2013-02-133-1/+36
|/ / /
* / / Avoid to_sym callsSantiago Pastorino2013-02-131-1/+1
|/ /
* | Merge pull request #9204 from ranjaykrishna/col-probAaron Patterson2013-02-128-1/+43
|\ \
| * | checking in the abstractions for valid type checking:Ranjay Krishna2013-02-128-1/+43
* | | Merge pull request #9206 from ranjaykrishna/use_define_methodCarlos Antonio da Silva2013-02-121-18/+13
|\ \ \
| * | | reverted back our changes and added in the new define_methodRanjay Krishna2013-02-121-18/+13
| |/ /
* | | test for regression from a712e08ebe21f6d8653a0e6602df2e0f5d40d9caAaron Patterson2013-02-111-0/+6
* | | Merge pull request #9250 from senny/8583_fix_engines_documentation_example_codeSteve Klabnik2013-02-111-4/+12
|\ \ \
| * | | fix the example code in the engines guide. closes #8583.Yves Senn2013-02-111-0/+8
| * | | remove trailing whitespace from engines guideYves Senn2013-02-111-4/+4
* | | | Merge pull request #9247 from lest/store-moduleCarlos Antonio da Silva2013-02-114-12/+54
|\ \ \ \ | |/ / / |/| | |
| * | | define Active Record Store accessors in a moduleSergey Nartimov2013-02-114-12/+54
* | | | Improve changelog entry from #9221 [ci skip]Carlos Antonio da Silva2013-02-112-18/+16
* | | | Add changelog entry for #9177 [ci skip]Carlos Antonio da Silva2013-02-111-4/+11
* | | | Merge pull request #9221 from thenickcox/image_alt_attributeCarlos Antonio da Silva2013-02-113-4/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Improve img alt attribute for screen readersthenickcox2013-02-093-4/+40
* | | | fixing bit string testAaron Patterson2013-02-101-3/+3
* | | | Merge pull request #9245 from vasconcelloslf/fix_guide_typoSteve Klabnik2013-02-101-1/+1
|\ \ \ \
| * | | | fix a typo on the engine guideLuis Vasconcellos2013-02-111-1/+1
|/ / / /
* | | | Merge pull request #9240 from tricknotes/supress-warningGuillermo Iguaran2013-02-101-0/+2
|\ \ \ \
| * | | | Supress warning about method redifinitionRyunosuke SATO2013-02-111-0/+2
|/ / / /
* | | | Merge pull request #9238 from norman/unicode_62Carlos Antonio da Silva2013-02-102-1/+1
|\ \ \ \
| * | | | Update to latest Unicode data.Norman Clarke2013-02-102-1/+1
* | | | | Merge pull request #8643 from tricknotes/remove-method-redefined-warningAndrew White2013-02-101-0/+1
|\ \ \ \ \
| * | | | | Remove method redefined warningRyunosuke SATO2013-02-111-0/+1
* | | | | | Merge pull request #7730 from beyond/gzipXavier Noria2013-02-103-2/+25
|\ \ \ \ \ \
| * | | | | | added compress options for gzipBeyond2013-02-103-2/+25
|/ / / / / /
* | | | | | Prefer Ruby 2.0; require 1.9.3+Jeremy Kemper2013-02-094-9/+9
* | | | | | Merge pull request #9234 from senny/9231_no_numbers_in_route_namespaces_allowedCarlos Antonio da Silva2013-02-092-1/+13
|\ \ \ \ \ \
| * | | | | | the `:controller` option for routes can contain numbers. closes #9231.Yves Senn2013-02-092-1/+13
* | | | | | | Merge pull request #9233 from rahul100885/masterCarlos Antonio da Silva2013-02-093-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added notice message for destroy method in scaffoldRahul P. Chaudhari2013-02-103-1/+6
* | | | | | | Update activerecord/CHANGELOG.mdGuillermo Iguaran2013-02-091-1/+1
* | | | | | | Merge pull request #9232 from robertomiranda/where-with-empty-hashGuillermo Iguaran2013-02-091-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use IN operator like arel for empty hash in where clauserobertomiranda2013-02-091-1/+1
|/ / / / / /