aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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).
| * Simplify code by taking advantage of latest mocha (v0.13.0).James Mead2012-11-122-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only works with mocha v0.13.0 or later. Note that this also fixes a few subtle bugs present in the current implementation :- * Mocha was raising a `MiniTest::Assertion` instead of a `Mocha::ExpectationError` as intended. The latter is not recognized by MiniTest as an assertion failure and so it is recorded as a test *error*, not a test *failure* as it ought to. This leads to potentially confusing output in the test results. * Mocha verification should happen as part of the test. The verification of expectations is equivalent to a set of assertions. These assertions should happen as *part of* the test so that they have a chance to cause the test to fail, and not just as part of the teardown. Also if an assertion fails during the test, then there is no need to verify expectations, because only the first assertion failure is normally reported and all subsequent bets are off. * Expectation verification should be counted as an assertion. Mocha cannot record each expectation verification as an assertion, because we weren't passing in an assertion counter to `#mocha_verify`.
* | Ruby 2.0.0 defaults source encoding to utf-8 so we need to specifically tag ↵Aaron Patterson2012-11-121-0/+1
| | | | | | | | this file with us-ascii
* | 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 #8182
| * | `#as_json` isolates options when encoding a hash. Closes #8182Yves Senn2012-11-123-1/+24
| |/ | | | | | | | | | | Setting options in a custom `#as_json` method had side effects. Modifications of the `options` hash leaked outside and influenced the conversion of other objects contained in the hash.
* | 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
| | | | | | | | | | voloko/sdoc seems to be maintained again, in particular the issues that made us fork it are resolved.
* | Merge pull request #8184 from vipulnsward/add_merge_testsCarlos Antonio da Silva2012-11-123-18/+25
|\ \ | | | | | | Merge and add tests related to #5215
| * | 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
| | | | | Thanks @toretore. https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#commitcomment-2134706
* Merge pull request #8173 from nikitug/match_classes_without_to_sCarlos Antonio da Silva2012-11-111-10/+10
|\ | | | | Match classes without to_s conversions.
| * Match classes without to_s conversions.Nikita Afanasenko2012-11-111-10/+10
| | | | | | | | There is no need in `value_under_case.class.to_s` conversion since case already matches classes with `Class === value_under_case`.
* | Merge pull request #8172 from nikitug/silent_diff_deprecationSantiago Pastorino2012-11-111-1/+3
|\ \ | | | | | | Test Hash#diff deprecation, also prevent deprecation message in AS tests
| * | 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 argument
| * Removing warning : ambiguous first argumentArun Agrawal2012-11-111-2/+2
|/
* Make ActiveRecord::Delegation#method_missing threadsafeJon Leighton2012-11-101-3/+21
| | | | | | | | | | | | Two threads may be in method_missing at the same time. If so, they might both try to define the same delegator method. Such a situation probably wouldn't result in a particularly spectacular bug as one method would probably just be overridden by an identical method, but it could cause warnings to pop up. (It could be worse if method definition is non-atomic in a particular implementation.) (We will also need this mutex shortly anyway, see #8127.)
* 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 variable
| * 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
|\ \ | | | | | | Remove unwanted transaction when has one association is built
| * | 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.
| * Keep the code related to serialization in Serialization module.Nikita Afanasenko2012-11-102-9/+13
|/ | | | We should not need any `serialized_attributes` checks outside `ActiveRecord::AttributeMethods::Serialization` module.
* Merge pull request #8162 from fimmtiu/masterRafael Mendonça França2012-11-091-2/+2
|\ | | | | Trivial documentation fix for ActiveModel::Naming comment [ci skip]
| * 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
| | | | | | | get is the most common usage, and match without an explicit verb was disallowed in 56cdc81c08b1847c5c1f699810a8c3b9ac3715a6. [ci skip]
* Gracefully handle upgrading apps with mass assigment configsAndrew White2012-11-091-0/+27
| | | | | | | | Most apps upgrading from 3.x will have options for mass assigment in their application.rb and environments/*.rb config files. Rather than just raising a NoMethodError when copying the config, this commit adds a warning message until either the protected_attributes gem is installed or the relevant config options are removed.
* Merge pull request #8158 from steveklabnik/deprecate_diffCarlos Antonio da Silva2012-11-093-3/+5
|\ | | | | Deprecate Hash#diff.
| * Deprecate Hash#diff.Steve Klabnik2012-11-093-3/+5
| | | | | | | | | | | | It's no longer used in Rails any more. See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more
* | Remove not used load hooks for active_record_configCarlos Antonio da Silva2012-11-092-6/+0
| | | | | | | | | | These were removed with ActiveRecord::Model in https://github.com/rails/rails/commit/9e4c41c903e8e58721f2c41776a8c60ddba7a0a9#L15L156
* | fix warningsJon Leighton2012-11-091-1/+1
| |
* | Properly deprecate ConnectionHandler#connection_poolsJon Leighton2012-11-093-8/+22
| | | | | | | | | | | | | | | | Rather than just changing it and hoping for the best. Requested by @jeremy: https://github.com/rails/rails/commit/ba1544d71628abff2777c9c514142d7e9a159111#commitcomment-2106059
* | Merge pull request #8157 from steveklabnik/remove_callback_duplicationRafael Mendonça França2012-11-091-7/+8
|\ \ | | | | | | Removing duplication in callback normalization.
| * | Removing duplication in callback normalization.Steve Klabnik2012-11-091-7/+8
| |/ | | | | | | These two things were 100% identical.
* | 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
| * | :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
| | | | | | | | | | | | | | | | | | | | | So that the scope may be a NullRelation and return a result without executing a query. Fixes #7928
* | | CollectionProxy#pluck issues no query for a new_record? ownerJon Leighton2012-11-092-0/+5
| | | | | | | | | | | | | | | | | | | | | Fixes #8102. I couldn't find a nicer way to deal with this than delegate the call to #scope, which will be a NullRelation when we want it to be.
* | | Nullify the relation at a more general level.Jon Leighton2012-11-093-7/+14
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to avoid hacks like the "return 0 if owner.new_record?" in #count (which this commit removes). Also, the relevant foreign key may actually be present even on a new owner record, in which case we *don't* want a null relation. This logic is encapsulated in the #null_scope? method. We also need to make sure that the CollectionProxy is not 'infected' with the NullRelation module, or else the methods from there will override the definitions in CollectionProxy, leading to incorrect results. Hence the nullify: false option to CollectionAssociation#scope. (This feels a bit nasty but I can't think of a better way.)
* | Merge pull request #8151 from nashby/forwardableCarlos Antonio da Silva2012-11-091-20/+2
|\ \ | | | | | | delegate PathSet's enumerator methods
| * | delegate PathSet's enumerator methodsVasiliy Ermolovich2012-11-091-20/+2
| | |
* | | Merge pull request #8153 from steveklabnik/fix_include_blankCarlos Antonio da Silva2012-11-091-1/+1
|\ \ \ | | | | | | | | Fix message about include_blank option. [ci skip]
| * | | Fix message about include_blank option.Steve Klabnik + Katrina Owen2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/commit/cb7d19b66badfbd1846c195913419c331701074e#commitcomment-2127148.
* | | | Relations built off collection associations with an unsaved owner should be ↵Jon Leighton2012-11-092-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null relations For example, the following should not run any query on the database: Post.new.comments.where(body: 'omg').to_a # => [] Fixes #5215.
* | | | Merge pull request #8152 from steveklabnik/squashing_guideXavier Noria2012-11-091-0/+38
|\ \ \ \ | |/ / / |/| | | Add note about squashing in contributor guide.
| * | | Add note about squashing in contributor guide.Steve Klabnik + Katrina Owen2012-11-091-0/+38
|/ / / | | | | | | | | | | | | We tell people how to do this all the time in the Issues tracker, so now we can just point them here.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 14:14:58 +0000