aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* config.generators javascript_engine default value is :js not nil [ci skip]Mehmet Emin İNAÇ2015-05-171-1/+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
| | | |
* | | | Merge pull request #20149 from karanarora/Typo-fixRafael Mendonça França2015-05-131-11/+11
|\| | | | | | | | | | | remove redundant parenthesis.
| * | | remove redundant parenthesis. karanarora2015-05-141-11/+11
| |/ /
* | | Merge pull request #20142 from zoltankiss/comment_fixRafael Mendonça França2015-05-131-4/+4
|\ \ \ | | | | | | | | Minor comment fix
| * | | Minor comment fix. [ci skip]Zoltan Kiss2015-05-131-4/+4
|/ / /
* | | Add Integer#positive? and Integer#negative? query methods in the vein of ↵David Heinemeier Hansson2015-05-134-0/+37
| | | | | | | | | | | | Fixnum#zero?
* | | Remove not used `options` argument from `ActiveSupport::JSON.decode`Carlos Antonio da Silva2015-05-131-8/+2
| | | | | | | | | | | | | | | | | | In Rails 4.0, json decoding relied on MultiJson. This changed from 4.1 forward since it reached its end of life, and this extra argument was kept for compatibility. We are safe to remove it now.
* | | Merge pull request #20121 from matthewrudy/remove-sanitize-hashSean Griffin2015-05-131-3/+1
|\ \ \ | | | | | | | | Remove call to sanitize_sql_hash_for_conditions
| * | | remove documentation for sanitize_sql_for_conditions with a HashMatthew Rudy Jacobs2015-05-121-2/+1
| | | |
| * | | Remove call to sanitize_sql_hash_for_conditionsMatthew Rudy Jacobs2015-05-121-1/+0
| | | | | | | | | | | | | | | | This method has already been removed.
* | | | invalid sti error message contains the full class name.Yves Senn2015-05-132-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can resolve confusing situation when a top level constant exists but a namespaced version is identified. Related to #19531.
* | | | Merge branch 'sti-subclass-from-attributes' of ↵Yves Senn2015-05-134-6/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/agrobbin/rails into agrobbin-sti-subclass-from-attributes Conflicts: activerecord/CHANGELOG.md
| * | | | allow setting of a demodulized class name when using STIAlex Robbin2015-05-114-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If your STI class looks like this: ```ruby class Company < ActiveRecord::Base self.store_full_sti_class = false class GoodCo < Company end class BadCo < Company end end ``` The expectation (which is valid) is that the `type` in the database is saved as `GoodCo` or `BadCo`. However, another expectation should be that setting `type` to `GoodCo` would correctly instantiate the object as a `Company::GoodCo`. That second expectation is what this should fix.
* | | | | Merge pull request #20136 from mcfiredrill/nodoc-postgresql-add-columnYves Senn2015-05-131-3/+1
|\ \ \ \ \ | | | | | | | | | | | | :nodoc: postgresql add_column
| * | | | | :nodoc: postgresql add_columnTony Miller2015-05-131-3/+1
|/ / / / /
* | | | | Merge pull request #20126 from drcapulet/masterRafael Mendonça França2015-05-133-10/+31
|\ \ \ \ \ | | | | | | | | | | | | Add full set of MySQL CLI options to support SSL authentication when using db:structure dump and load
| * | | | | Add full set of MySQL CLI options to support SSL authentication when using ↵Alex Coomans2015-05-123-10/+31
| | |/ / / | |/| | | | | | | | | | | | | db:structure dump and load
* | | | | Merge pull request #20131 from vngrs/missing_doc_about_assign_attributeRafael Mendonça França2015-05-121-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Add more detailed comment about _assign_attribute method [ci skip]
| * | | | | Add more detailed comment about _assign_attribute method [ci skip]Mehmet Emin İNAÇ2015-05-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | fix minor problems
* | | | | | Merge pull request #20130 from ↵Rafael Mendonça França2015-05-121-21/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | vngrs/refactor_abstract_mysql_adabter_type_to_sql_method Refactor abstract_mysql_adapter type_to_sql method
| * | | | | Refactor abstract_mysql_adapter type_to_sql methodMehmet Emin İNAÇ2015-05-131-21/+33
|/ / / / /
* | | | | Merge pull request #20128 from claudiob/remove-sudoRafael Mendonça França2015-05-127-7/+7
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Don’t encourage `sudo gem install`
| * | | | [ci skip] Don’t encourage `sudo gem install`claudiob2015-05-127-7/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think we are better off leaving `sudo` outside of the documented way of installing gems (`activerecord`, `actionpack`, …). We don’t want newbies to think that `sudo` is required or, even worse, than they actually have to type `[sudo] gem install`. In most scenarios, `sudo` is not needed to install gems, and people who do need it, probably already know about it. What do you think? :grin:
* | | | Merge pull request #20119 from yui-knk/fix/active_record_queryingYves Senn2015-05-121-1/+1
|\ \ \ \ | |_|_|/ |/| | | [ci skip] Fix `transaction` code example
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 10:56:58 +0000