aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14413 from arthurnn/port_test_ccGodfrey Chan2014-03-181-0/+11
|\ | | | | Add counter cache test for class_name
| * Add counter cache test for class_nameArthur Neves2014-03-171-0/+11
|/ | | | Backport test from #14410
* test should only pass if the pool.size+1 checkout failsAaron Patterson2014-03-171-3/+2
| | | | | Previously, any of the connection checkouts could have failed, and this test would pass.
* 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
|\ | | | | Track owning thread for connection pool
| * Reap connections based on owning-thread deathMatthew Draper2014-03-187-68/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .. not a general timeout. Now, if a thread checks out a connection then dies, we can immediately recover that connection and re-use it. This should alleviate the pool exhaustion discussed in #12867. More importantly, it entirely avoids the potential issues of the reaper attempting to check whether connections are still active: as long as the owning thread is alive, the connection is its business alone. As a no-op reap is now trivial (only entails checking a thread status per connection), we can also perform one in-line any time we decide to sleep for a connection.
| * Teach PostgreSQLAdapter#reset! to actually resetMatthew Draper2014-03-182-1/+37
|/ | | | It wasn't doing anything beyond clearing the statement cache.
* Merge pull request #14379 from robertomiranda/rake-notes.configGuillermo Iguaran2014-03-176-30/+81
|\ | | | | Add Public Api for Register New Extensions for Rake Notes
| * Rake notes should picked up new Extensions registered in the ↵robertomiranda2014-03-171-3/+19
| | | | | | | | config/application.rb file
| * 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 ↵robertomiranda2014-03-162-0/+14
| | | | | | | | at config level
| * 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 ↵robertomiranda2014-03-142-17/+5
| | | | | | | | have an API for register it in the corresponding gems
| * Add Public Api for register new extensions for Rake Notesrobertomiranda2014-03-142-15/+29
| |
* | Merge pull request #14090 from ↵Aaron Patterson2014-03-172-10/+30
|\ \ | | | | | | | | | | | | Fortisque/kevin/stream_error_in_main_thread_if_not_committed re-raise error if error occurs before committing in streaming
| * | re-raise error if error occurs before committing in streamingKevin Casey2014-03-142-10/+30
| | | | | | | | | | | | update the tests, using an if-else
* | | `where.not` adds `references` for `includes`.Yves Senn2014-03-174-0/+26
| | | | | | | | | | | | Closes #14406.
* | | fix `number_to_percentage` with `Float::NAN`, `Float::INFINITY`.Yves Senn2014-03-174-2/+14
| | | | | | | | | | | | | | | | | | | | | Closes #14405. This is a follow-up to 9e997e9039435617b6a844158f5437e97f6bc107 to restore the documented behavior.
* | | 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 ↵Jeremy Kemper2014-03-161-0/+1
| | | | | | | | | | | | than assume SecureRandom is available
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | The method `shallow?` returns false if the parent resource is a singleton so we need to check if we're not inside a nested scope before copying the :path and :as options to their shallow equivalents. Fixes #14388.
* | | Remove extra white-spaces [ci skip]Robin Dupret2014-03-161-13/+13
| | | | | | | | | | | | Follow up to 024e5e31
* | | 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 interpolation
| * | | Extend fixture label replacement to allow string interpolationEric Steele2014-03-154-1/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows fixtures to use their $LABEL as part of a string instead of limiting use to the entire value. mark: first_name: $LABEL username: $LABEL1973 email: $LABEL@$LABELmail.com users(:mark).first_name # => mark users(:mark).username # => mark1973 users(:mark).email # => mark@markmail.com
* | | Merge pull request #14396 from afshinator/masterJeremy Kemper2014-03-151-11/+28
|\ \ \ | | | | | | | | Reword 5.6 strong parameters and private method stuff [ci skip]
| * | | 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 tests
| * | | | Fix MailerPreview broken testsArthur Neves2014-03-151-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `BaseMailerPreview.welcome` is an instance method, so we need to stub the method on a instance level and not on Class. The stub is important to make sure the Message object is the same in the other expectations. This was working randomly because Mocha uses == to compare two objects on the `with()` expectation and even if the Mail::Message objects were not the same object they are equal, but thats not the case in 100% of the runs. So we need to make sure we use `.any_instance` method and have the right message object.
* | | | | 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 helper Conflicts: actionview/CHANGELOG.md actionview/test/template/form_collections_helper_test.rb
| * | | | 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]
| * | | | | Minor grammer, code conventions fix [ci skip]Zoltan Kiss2014-03-151-2/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb
* | | | | 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 ↵Jeremy Kemper2014-03-151-5/+3
| | | | | | | | | | | | | | | | | | | | requires. Appropriate to keep this, users don't care that the implementation got unified.
* | | | | Merge pull request #14380 from ↵Yves Senn2014-03-1549-61/+51
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | tgxworld/use_teardown_helper_method_in_activerecord Use teardown helper method.
| * | | | Use teardown helper method.Guo Xiang Tan2014-03-1449-61/+51
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Follow-Up to https://github.com/rails/rails/pull/14348 Ensure that SQLCounter.clear_log is called after each test. This is a step to prevent side effects when running tests. This will allow us to run them in random order.
* | | | Obey `validate: false` option for habtmCarlos Antonio da Silva2014-03-144-1/+39
| | | | | | | | | | | | | | | | Fixes #14383.
* | | | Merge pull request #14387 from huoxito/touch-api-docArthur Nogueira Neves2014-03-141-2/+2
|\ \ \ \ | | | | | | | | | | Update callbacks executed on AR::Base#touch [skip ci]
| * | | | Update callbacks executed on AR::Base#touch [skip ci]Washington Luiz2014-03-141-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | As of https://github.com/rails/rails/pull/12031 after_commit and after_rollback are also executed
* | | | Merge pull request #10278 from codeodor/fix-to_json-for-EnumerableGodfrey Chan2014-03-144-12/+40
|\ \ \ \ | | | | | | | | | | Fix #to_json for BasicObject Enumerables
| * | | | Fix #to_json for BasicObject EnumerablesSammy Larbi2014-03-144-12/+40
| |/ / /
* | | | Merge pull request #14373 from schneems/schneems/jdbc-ar-2Rafael Mendonça França2014-03-143-6/+12
|\ \ \ \ | | | | | | | | | | Allow custom JDBC urls
| * | | | better test error messagesschneems2014-03-141-4/+4
| | | | |
| * | | | Allow custom JDBC urlsschneems2014-03-142-2/+8
| | | | | | | | | | | | | | | | | | | | mitigates #14323
* | | | | Fix the resolver cache and stop mutating the lookup_contextRafael Mendonça França2014-03-144-32/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Before we had a bug in the resolver cache so the disable_cache were not working when passing options to find
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 17:17:32 +0000