Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7601 from jrochkind/connection_pool_unify_exceptions | Aaron Patterson | 2012-09-11 | 2 | -18/+12 |
|\ | | | | | ConnectionPool, unify exceptions, ConnectionTimeoutError | ||||
| * | ConnectionPool, unify exceptions, ConnectionTimeoutError | Jonathan Rochkind | 2012-09-11 | 2 | -18/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a result of different commits, ConnectionPool had become of two minds about exceptions, sometimes using PoolFullError and sometimes using ConnectionTimeoutError. In fact, it was using ConnectionTimeoutError internally, but then recueing and re-raising as a PoolFullError. There's no reason for this bifurcation, standardize on ConnectionTimeoutError, which is the rails2 name and still accurately describes semantics at this point. History In Rails2, ConnectionPool raises a ConnectionTimeoutError if it can't get a connection within timeout. Originally in master/rails3, @tenderlove had planned on removing wait/blocking in connectionpool entirely, at that point he changed exception to PoolFullError. But then later wait/blocking came back, but exception remained PoolFullError. Then in 02b233556377 pmahoney introduced fair waiting logic, and brought back ConnectionTimeoutError, introducing the weird bifurcation. ConnectionTimeoutError accurately describes semantics as of this point, and is backwards compat with rails2, there's no reason for PoolFullError to be introduced, and no reason for two different exception types to be used internally, no reason to rescue one and re-raise as another. Unify! | ||||
* | | Merge pull request #7564 from kennyj/using_mysqldump | Carlos Antonio da Silva | 2012-09-11 | 3 | -28/+30 |
|\ \ | |/ |/| | | | Use mysqldump native commands when rake db:structure:dump. Closes #5547 Fixes database tasks config to use encoding instead of charset. | ||||
| * | Use configuration['encoding'], because database configuration use not ↵ | kennyj | 2012-09-12 | 2 | -5/+5 |
| | | | | | | | | charset but encoding. | ||||
| * | Use native mysqldump command for 'rake db:structure:dump'. | kennyj | 2012-09-12 | 3 | -24/+26 |
|/ | |||||
* | Merge pull request #7488 from needfeed/master | Rafael Mendonça França | 2012-09-11 | 2 | -1/+9 |
|\ | | | | | Have rails dbconsole pass sslca to the mysql command line client. | ||||
| * | Support MySQL SSL in rails dbconsole. | needfeed | 2012-09-10 | 2 | -1/+9 |
| | | |||||
* | | Merge pull request #7569 from ↵ | Carlos Antonio da Silva | 2012-09-11 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | skorfmann/improve-has-many-through-exception-message Improve exception message for HasManyThroughAssociationPolymorphicSourceError | ||||
| * | | Improve exception message for HasManyThroughAssociationPolymorphicSourceError | Sebastian Korfmann | 2012-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Exception message was misleading, as it is possible to have a polymorphic 'has_many :through' join model. | ||||
* | | | Merge pull request #7594 from guilleiguaran/rb-template-handler | Rafael Mendonça França | 2012-09-10 | 4 | -0/+14 |
|\ \ \ | | | | | | | | | Add .rb template handler | ||||
| * | | | Add .rb template handler | Guillermo Iguaran | 2012-09-11 | 4 | -0/+14 |
| | | | | | | | | | | | | | | | | This handler simply allows arbitrary Ruby code as a template | ||||
* | | | | Merge pull request #7586 from route/precompile-should-not-fail-quietly | Rafael Mendonça França | 2012-09-10 | 1 | -7/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Rake assets:precompile shouldn't fail quietly. | ||||
| * | | | Rake assets:precompile shouldn't fail quietly. | Dmitry Vorotilin | 2012-09-11 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | We should show to user original issue if rake task will be aborted. | ||||
* | | | | Merge pull request #7592 from bogdan/callbacks-changelog | José Valim | 2012-09-10 | 1 | -19/+0 |
|\ \ \ \ | | | | | | | | | | | Revert "Changelog entry for PR #7560" | ||||
| * | | | | Revert "Changelog entry for PR #7560" | Bogdan Gusiev | 2012-09-10 | 1 | -19/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ca80067bbe4662c60b933188ad3769605742e812. Entry already added in 895233 | ||||
* | | | | | Merge pull request #7591 from bogdan/callbacks-changelog | José Valim | 2012-09-10 | 1 | -0/+19 |
|\| | | | | | | | | | | | | | | Changelog entry for PR #7560 | ||||
| * | | | | Changelog entry for PR #7560 | Bogdan Gusiev | 2012-09-10 | 1 | -0/+19 |
|/ / / / | |||||
* | | | | Merge pull request #7432 from kennyj/fix_annoy_warning | Rafael Mendonça França | 2012-09-10 | 3 | -2/+13 |
|\ \ \ \ | |/ / / |/| | | | Suppress annoy warning, when executing AR's testcases. | ||||
| * | | | Remove expired comment. This method is used from other place. | kennyj | 2012-09-11 | 1 | -2/+0 |
| | | | | |||||
| * | | | Fix annoy warning, when executing testcase. | kennyj | 2012-09-11 | 2 | -0/+13 |
|/ / / | |||||
* | | | Merge pull request #7513 from kalys/master | Carlos Antonio da Silva | 2012-09-09 | 10 | -14/+16 |
|\ \ \ | | | | | | | | | ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers. | ||||
| * | | | ' dates back to SGML when ' was introduced in HTML 4.0 | Kalys Osmonov | 2012-09-09 | 10 | -14/+16 |
| |/ / | |||||
* | | | indent fix [ci skip] | Vijay Dev | 2012-09-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-09 | 19 | -74/+149 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | ||||
| * | | | minor fixes and edits [ci skip] | Vijay Dev | 2012-09-09 | 5 | -22/+14 |
| | | | | |||||
| * | | | add :nodoc: to AR::Store::IndifferentCoder [ci skip] | Francesco Rodriguez | 2012-09-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | add note about using block form of unscoped in AR Querying guide [ci skip] | Francesco Rodriguez | 2012-09-08 | 1 | -5/+19 |
| | | | | |||||
| * | | | Fix a bunch of typos, reword some things for clarity. | Jonathan Roes | 2012-09-07 | 1 | -43/+36 |
| | | | | |||||
| * | | | Fix a typo | 1334 | 2012-09-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | default scope should return an ActiveRecord::Relation [ci skip] | José Corcuera | 2012-09-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | How to use default_scope as a class method | José Corcuera | 2012-09-07 | 1 | -0/+10 |
| | | | | |||||
| * | | | Added forgotten :message option to ActiveModel validates documentation | Anatoly Makarevich | 2012-09-07 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge pull request #112 from cnaize/master | cnaize | 2012-09-07 | 1 | -1/+4 |
| |\ \ \ | | | | | | | | | | | extended example | ||||
| | * | | | extended example | cnaize | 2012-09-07 | 1 | -1/+4 |
| |/ / / | |||||
| * | | | Added information about dynamic delivery options to action mailer guides | Aditya Sanghi | 2012-09-07 | 1 | -0/+18 |
| | | | | |||||
| * | | | Dynamic Delivery Method Options | Aditya Sanghi | 2012-09-07 | 1 | -0/+14 |
| | | | | |||||
| * | | | Redirect block with arity of 1 is deprecated. | Semyon Perepelitsa | 2012-09-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixed non-working around callback example | Aaron Renner | 2012-09-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Doc: sweepers only work on Active Record Models | schneems | 2012-09-05 | 2 | -2/+4 |
| | | | | | | | | | | | | In response to this rails issue: https://github.com/rails/rails/issues/3729 | ||||
| * | | | Fix a typo | Andreas Loupasakis | 2012-09-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed array wrongly translated in footnote in a guide [ci skip] | Aldo "xoen" Giambelluca | 2012-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | In the sentence "If <tt>@post.author_ids</tt> is [1], this would ..." the array [1] is converted in a footnote, fixed this using <notextile>. | ||||
| * | | | Add giant belongs_to 'please don't pluralize me' note | Ryan Bigg | 2012-09-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | I've personally seen too many newbies get this wrong and pluralize the association | ||||
| * | | | update caching guide: stale? can also figure out last_modified on its own | Konstantin Haase | 2012-09-04 | 1 | -1/+12 |
| | | | | |||||
| * | | | Update caching guide: memcache-client was replaced with dalli | Guillermo Iguaran | 2012-09-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add section about tagged logging | Gaurish Sharma | 2012-09-03 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | Tagged logging for which Rails has support since [3.2](http://guides.rubyonrails.org/3_2_release_notes.html#tagged-logging). It is trivial & useful but unless somebody explicitly searches API docs, he/she may not know about it. Hence, I added it in guides. | ||||
| * | | | Fix indenentation in comment to stop the end of comment from appearing in a ↵ | Anuj Dutta | 2012-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | <pre> block. | ||||
| * | | | Fixed validation issue and titles in Migrations guide [ci skip] | Aldo "xoen" Giambelluca | 2012-09-02 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the title of the 3.5 chapter from "Using the change Method" to "When to Use the change Method" since the chapter tells the migration definitions supported by the change method. This fix the duplicate ID in the document. I've also changed some of the titles to respect the Guides guidelines. | ||||
| * | | | Fixed validation issue related to taken ID in Layout and Rendering guide [ci ↵ | Aldo "xoen" Giambelluca | 2012-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | skip] | ||||
| * | | | Fixed validation issues in the "Configuring Rails Applications" guide [ci skip] | Aldo "xoen" Giambelluca | 2012-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | erb tag wasn't closed well | ||||
| * | | | Fixed validation issues related to taken IDs in AR Querying guide [ci skip] | Aldo "xoen" Giambelluca | 2012-09-02 | 1 | -4/+4 |
| | | | |