aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use BCrypt's MIN_COST in the test environment for speedier testsTrevor Turk2012-11-145-2/+52
* Merge pull request #8202 from nikitug/regression_test_on_dynamic_finder_resultCarlos Antonio da Silva2012-11-132-0/+13
|\
| * Regression test for #7238Nikita Afanasenko2012-11-132-0/+13
* | Merge pull request #8176 from senny/7551_pluck_with_selectRafael Mendonça França2012-11-133-2/+19
|\ \
| * | `#pluck` can be used on a relation with `select` clause.Yves Senn2012-11-123-1/+18
| * | cleanup, removed whitespace from CHANGELOGYves Senn2012-11-121-1/+1
* | | Merge pull request #8201 from nikitug/regression_test_on_ar_cache_key_precisionRafael Mendonça França2012-11-131-0/+7
|\ \ \
| * | | Add a regression test on #8195Nikita Afanasenko2012-11-131-0/+7
| | |/ | |/|
* | | Use new mocha version and add changelog entry for #8180Carlos Antonio da Silva2012-11-132-1/+3
* | | Merge pull request #8180 from freerange/mocha-fixes-supporting-only-0.13-onwardsCarlos Antonio da Silva2012-11-132-25/+5
|\ \ \ | |/ / |/| |
| * | Simplify code by taking advantage of latest mocha (v0.13.0).James Mead2012-11-122-25/+5
| |/
* | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag t...Aaron Patterson2012-11-121-0/+1
* | Merge pull request #8185 from senny/8182_as_json_options_stick_aroundCarlos Antonio da Silva2012-11-123-1/+24
|\ \
| * | `#as_json` isolates options when encoding a hash. Closes #8182Yves Senn2012-11-123-1/+24
| |/
* | only clear caches if we are actually connected to the databaseAaron Patterson2012-11-121-2/+4
* | depend on voloko/sdoc againXavier Noria2012-11-121-1/+1
* | Merge pull request #8184 from vipulnsward/add_merge_testsCarlos Antonio da Silva2012-11-123-18/+25
|\ \
| * | Merge and add tests related to 5215Vipul A M2012-11-123-18/+25
| |/
* / Debugger gem doesn't work with patchlevel < 327Santiago Pastorino2012-11-121-1/+2
|/
* Remove duplicated ConnectionHandling extension in AR::BaseCarlos Antonio da Silva2012-11-111-1/+0
* Merge pull request #8173 from nikitug/match_classes_without_to_sCarlos Antonio da Silva2012-11-111-10/+10
|\
| * Match classes without to_s conversions.Nikita Afanasenko2012-11-111-10/+10
* | Merge pull request #8172 from nikitug/silent_diff_deprecationSantiago Pastorino2012-11-111-1/+3
|\ \
| * | Test Hash#diff deprecation, also prevent deprecation message in AS testsNikita Afanasenko2012-11-111-1/+3
| |/
* | Merge pull request #8170 from arunagw/warning_removed_railtiesSantiago Pastorino2012-11-111-2/+2
|\ \ | |/ |/|
| * Removing warning : ambiguous first argumentArun Agrawal2012-11-111-2/+2
|/
* Make ActiveRecord::Delegation#method_missing threadsafeJon Leighton2012-11-101-3/+21
* recent railties changes added to the release notes [ci skip]Vijay Dev2012-11-101-0/+39
* update turbolinks readme link [ci skip]Vijay Dev2012-11-101-2/+2
* Merge pull request #8165 from arunagw/warning_removed_unused_variablesCarlos Antonio da Silva2012-11-102-2/+2
|\
| * Removing warning : assigned but unused variableArun Agrawal2012-11-102-2/+2
* | Merge pull request #8154 from bogdan/has_one_association_performanceCarlos Antonio da Silva2012-11-103-1/+24
|\ \
| * | Do not create useless database transaction when building `has_one` association.Bogdan Gusiev2012-11-103-1/+24
|/ /
* | Merge pull request #8164 from nikitug/keep_serialization_in_its_moduleCarlos Antonio da Silva2012-11-102-9/+13
|\ \ | |/ |/|
| * Keep the code related to serialization in Serialization module.Nikita Afanasenko2012-11-102-9/+13
|/
* Merge pull request #8162 from fimmtiu/masterRafael Mendonça França2012-11-091-2/+2
|\
| * Trivial documentation fix for ActiveModel::Naming comment.Dennis Taylor2012-11-091-2/+2
|/
* Use get in the redirection doc examplesCarlos Antonio da Silva2012-11-091-7/+7
* Gracefully handle upgrading apps with mass assigment configsAndrew White2012-11-091-0/+27
* Merge pull request #8158 from steveklabnik/deprecate_diffCarlos Antonio da Silva2012-11-093-3/+5
|\
| * Deprecate Hash#diff.Steve Klabnik2012-11-093-3/+5
* | Remove not used load hooks for active_record_configCarlos Antonio da Silva2012-11-092-6/+0
* | fix warningsJon Leighton2012-11-091-1/+1
* | Properly deprecate ConnectionHandler#connection_poolsJon Leighton2012-11-093-8/+22
* | Merge pull request #8157 from steveklabnik/remove_callback_duplicationRafael Mendonça França2012-11-091-7/+8
|\ \
| * | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
| |/
* | Merge pull request #8116 from senny/7993_configure_counter_cache_for_has_manyJon Leighton2012-11-096-2/+19
|\ \
| * | :counter_cache option for to support custom named counter caches. Closes #7993Yves Senn2012-11-046-2/+19
* | | Delegate all calculations to the scope.Jon Leighton2012-11-093-4/+7
* | | CollectionProxy#pluck issues no query for a new_record? ownerJon Leighton2012-11-092-0/+5