aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #20175 from eugeneius/copy_schema_cache_after_forkRafael Mendonça França2015-05-183-24/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add schema cache to new connection pool after fork
| * | | | | | Add schema cache to new connection pool after forkEugene Kenny2015-05-173-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record detects when the process has forked and automatically creates a new connection pool to avoid sharing file descriptors. If the existing connection pool had a schema cache associated with it, the new pool should copy it to avoid unnecessarily querying the database for its schema. The code to detect that the process has forked is in ConnectionHandler, but the existing test for it was in the ConnectionManagement test file. I moved it to the right place while I was writing the new test for this change.
* | | | | | | Prefer assert_not over refuteRafael Mendonça França2015-05-182-2/+2
| | | | | | |
* | | | | | | Merge pull request #20191 from juggernaut-/patch-1Rafael Mendonça França2015-05-183-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added ActionDispatch::Journey::Routes#empty?
| * | | | | | | ActionDispatch::Journey::Routes#empty? test casesValentine Valyaeff2015-05-193-1/+17
| | | | | | | |
| * | | | | | | Added ActionDispatch::Journey::Routes#empty?juggernaut-2015-05-181-0/+4
| | | | | | | |
* | | | | | | | Merge pull request #20187 from yui-knk/refactor/type_intRafael Mendonça França2015-05-181-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Refactoring `ActiveRecord::Type::Integer` limit
| * | | | | | | | Refactoring `ActiveRecord::Type::Integer` limityui-knk2015-05-181-3/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #20192 from kamipo/divide_to_column_options_handling_methodsRafael Mendonça França2015-05-182-10/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Divide methods for handling column options separately
| * | | | | | | | | Divide methods for handling column options separatelyRyuta Kamizono2015-05-182-10/+34
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #20190 from kamipo/fix_serial_with_quoted_sequence_nameRafael Mendonça França2015-05-182-1/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Fix `serial?` with quoted sequence name
| * | | | | | | | Fix `serial?` with quoted sequence nameRyuta Kamizono2015-05-182-1/+10
| |/ / / / / / /
* | | | | | | | Merge pull request #20082 from sh6khan/nested-attributes-docsEileen M. Uchitelle2015-05-181-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | docs for updating nested attributes while creating parent record
| * | | | | | | | docs for updating nested attributes while creating parent record [cish6khan2015-05-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip]
* | | | | | | | | sqlite3_mem has an existing connectionMatthew Draper2015-05-181-1/+3
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must account for receiving one less call to #new_connection, but the test otherwise remains valid.
* | | | | | | | better `add_reference` documentation. [ci skip]Yves Senn2015-05-182-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch - reduces the duplication among the `reference`-family methods. - better explains all the optians available for `add_reference`. - redirects to user from `references` to `add_reference`. Originated by #20184.
* | | | | | | | Merge pull request #20182 from repinel/remove-assigns-from-api-doc1Yves Senn2015-05-181-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | [ci skip] remove `assigns` from the integration test example in API docs
| * | | | | | | [ci skip] remove `assigns` from the integration test example in API docsRoque Pinel2015-05-171-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Based on #19976 and #18305.
* | | | | | | Merge pull request #20178 from ↵Santiago Pastorino2015-05-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/fix_wrong_default_value_of_javascript_engine config.generators javascript_engine default value is :js not nil
| * | | | | | | config.generators javascript_engine default value is :js not nil [ci skip]Mehmet Emin İNAÇ2015-05-171-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #20179 from gouravtiwari/patch-5Santiago Pastorino2015-05-171-5/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | formatting changes for mail options
| * | | | | | | | formatting changes [ci skip]Gourav Tiwari2015-05-171-5/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #20180 from ↵Santiago Pastorino2015-05-171-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | vngrs/add_missing_documentation_about_generators_resource_route add missing documentation about generators resource_route [ci skip]
| * | | | | | | add missing documentation about generators resource_route [ci skip]Mehmet Emin İNAÇ2015-05-171-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #20176 from repinel/remove_test_unit_from_docsAbdelkader Boudih2015-05-172-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [ci skip] remove unnecessary mention to Test::Unit from docs
| * | | | | | [ci skip] remove unnecessary mention to Test::Unit from docsRoque Pinel2015-05-162-5/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the guide to state that Rails uses Minitest as the default test framework. Remove unnecessary mention to Test::Unit from the API docs ('constantize' and 'safe_constantize').
* | | | | | Merge pull request #20173 from imtayadeway/tw/active-record-validations-docsKasper Timm Hansen2015-05-161-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Improve grammar/syntax in AR validations docs.
| * | | | | | [ci skip] Improve grammar/syntax in AR validations docs.Tim Wade2015-05-161-12/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #20172 from prathamesh-sonpatki/changelog-passArun Agrawal2015-05-165-9/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Pass over CHANGELOGS [ci skip]
| * | | | | | Pass over CHANGELOGS [ci skip]Prathamesh Sonpatki2015-05-165-9/+13
|/ / / / / /
* | | | | | Merge pull request #14938 from thedarkone/pool-lock-fixMatthew Draper2015-05-165-92/+577
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Reducing AR::ConPool's critical (synchronized) section
| * | | | | AR::ConPool - remove synchronization around connection cache.thedarkone2015-05-143-84/+436
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed `@reserved_connections` -> `@thread_cached_conns`. New name clearly conveys the purpose of the cache, which is to speed-up `#connection` method. The new `@thread_cached_conns` now also uses `Thread` objects as keys (instead of previously `Thread.current.object_id`). Since there is no longer any synchronization around `@thread_cached_conns`, `disconnect!` and `clear_reloadable_connections!` methods now pre-emptively obtain ownership (via `checkout`) of all existing connections, before modifying internal data structures. A private method `release` has been renamed `thread_conn_uncache` to clear-up its purpose. Fixed some brittle `thread.status == "sleep"` tests (threads can go into sleep even without locks).
| * | | | | AR::ConPool - establish connections outside of critical section.thedarkone2015-05-143-28/+136
| | | | | |
| * | | | | AR::ConPool - reduce post checkout critical section.thedarkone2015-05-143-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | Move post checkout connection verification out of mutex.synchronize.
* | | | | | Merge pull request #20159 from vngrs/remove_unnecessary_set_requiresSantiago Pastorino2015-05-143-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove redundant require 'set' lines
| * | | | | | Remove redundant require 'set' linesMehmet Emin İNAÇ2015-05-153-3/+0
| | | | | | |
* | | | | | | Merge pull request #20160 from ankit8898/security-guideSantiago Pastorino2015-05-141-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Dead blog/site links [ci skip]
| * | | | | | Dead blog/site links [ci skip]Ankit Gupta2015-05-141-1/+1
|/ / / / / /
* | | | | | Merge pull request #20155 from y-yagi/remove_warning_from_integer_ext_testCarlos Antonio da Silva2015-05-141-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | remove warning from integer ext test
| * | | | | remove warning from integer ext testyuuji.yaginuma2015-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this removes the following warning: ``` test/core_ext/integer_ext_test.rb:34: warning: ambiguous first argument; put parentheses or a space even after `-' operator test/core_ext/integer_ext_test.rb:38: warning: ambiguous first argument; put parentheses or a space even after `-' operator ```
* | | | | | Merge pull request #20153 from nygrenh/remove-local_assigns-clutterMatthew Draper2015-05-144-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not put partial name to local_assigns when rendering without an object
| * | | | | | Do not put partial name to local_assigns when rendering without an objectHenrik Nygren2015-05-144-1/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one rendered a partial template without specifying an object or a collection (e.g. <%= render partial: 'partial_name' %>), Rails would make an object called :partial_name available in local_assigns. I don't think this was the intended behavior, since no local variable called 'partial_name' gets defined in the view.
* | | | | | Merge pull request #20113 from claudiob/remove-rails31-refsYves Senn2015-05-146-34/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ci skip] Remove comments about Rails 3.1
| * | | | | [ci skip] Remove comments about Rails 3.1claudiob2015-05-116-34/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stems from https://github.com/rails/rails/pull/20105#issuecomment-100900939 where @senny said: > From my point of view, all the docs (guides, API) are version bound. > They should describe that version and continue to be available when newer versions are released. > The cross referencing can be done by the interested user.
* | | | | | Merge pull request #20151 from imtayadeway/tw/active-record-migrations-docsZachary Scott2015-05-131-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Improve phrasing in AR migrations docs.
| * | | | | | [ci skip] Improve phrasing in AR migrations docs.Tim Wade2015-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * insert 'and' into a poorly formed sentence. * avoid using 'reverse' twice in the same sentence (which would indicate the opposite of what is meant)
* | | | | | | Merge pull request #20146 from karanarora/Doc-fixesClaudio B.2015-05-131-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Rails documentation standard is american english. [ci skip]
| * | | | | | Rails documentation standard is american english. [ci skip]karanarora2015-05-141-1/+1
| | | | | | |
* | | | | | | Merge pull request #20150 from karanarora/Typo-fixRafael Mendonça França2015-05-131-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | remove redundant parenthesis
| * | | | | | remove redundant parenthesiskaranarora2015-05-141-1/+1
| | | | | | |