aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | warning removed.Arun Agrawal2012-09-122-2/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Unused variable 2. possibly useless use of a variable in void context
* | | | | | | | Action Mailer async flag is true by default using a Synchronous implSantiago Pastorino2012-09-1110-79/+61
| | | | | | | |
* | | | | | | | Merge pull request #7601 from jrochkind/connection_pool_unify_exceptionsAaron Patterson2012-09-112-18/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | ConnectionPool, unify exceptions, ConnectionTimeoutError
| * | | | | | | ConnectionPool, unify exceptions, ConnectionTimeoutErrorJonathan Rochkind2012-09-112-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_mysqldumpCarlos Antonio da Silva2012-09-113-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 ↵kennyj2012-09-122-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | charset but encoding.
| * | | | | | Use native mysqldump command for 'rake db:structure:dump'.kennyj2012-09-123-24/+26
|/ / / / / /
* | | | | | Merge pull request #7488 from needfeed/masterRafael Mendonça França2012-09-112-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Have rails dbconsole pass sslca to the mysql command line client.
| * | | | | | Support MySQL SSL in rails dbconsole.needfeed2012-09-102-1/+9
| | | | | | |
* | | | | | | Merge pull request #7569 from ↵Carlos Antonio da Silva2012-09-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skorfmann/improve-has-many-through-exception-message Improve exception message for HasManyThroughAssociationPolymorphicSourceError
| * | | | | | | Improve exception message for HasManyThroughAssociationPolymorphicSourceErrorSebastian Korfmann2012-09-101-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-handlerRafael Mendonça França2012-09-104-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add .rb template handler
| * | | | | | | | Add .rb template handlerGuillermo Iguaran2012-09-114-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This handler simply allows arbitrary Ruby code as a template
* | | | | | | | | Merge pull request #7586 from route/precompile-should-not-fail-quietlyRafael Mendonça França2012-09-101-7/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Rake assets:precompile shouldn't fail quietly.
| * | | | | | | | Rake assets:precompile shouldn't fail quietly.Dmitry Vorotilin2012-09-111-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should show to user original issue if rake task will be aborted.
* | | | | | | | | Merge pull request #7592 from bogdan/callbacks-changelogJosé Valim2012-09-101-19/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Changelog entry for PR #7560"
| * | | | | | | | | Revert "Changelog entry for PR #7560"Bogdan Gusiev2012-09-101-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ca80067bbe4662c60b933188ad3769605742e812. Entry already added in 895233
* | | | | | | | | | Merge pull request #7591 from bogdan/callbacks-changelogJosé Valim2012-09-101-0/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changelog entry for PR #7560
| * | | | | | | | | Changelog entry for PR #7560Bogdan Gusiev2012-09-101-0/+19
|/ / / / / / / / /
* | | | | | | | | Merge pull request #7432 from kennyj/fix_annoy_warningRafael Mendonça França2012-09-103-2/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Suppress annoy warning, when executing AR's testcases.
| * | | | | | | | Remove expired comment. This method is used from other place.kennyj2012-09-111-2/+0
| | | | | | | | |
| * | | | | | | | Fix annoy warning, when executing testcase.kennyj2012-09-112-0/+13
|/ / / / / / / /
* | | | | | | | Merge pull request #7513 from kalys/masterCarlos Antonio da Silva2012-09-0910-14/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | ERB::Util.html_escape encodes single quote as #39. Decimal form has better support in old browsers.
| * | | | | | | &#39 dates back to SGML when &#x27 was introduced in HTML 4.0Kalys Osmonov2012-09-0910-14/+16
| |/ / / / / /
* | | | | | | indent fix [ci skip]Vijay Dev2012-09-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-0919-74/+149
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * | | | | | | minor fixes and edits [ci skip]Vijay Dev2012-09-095-22/+14
| | | | | | | |
| * | | | | | | add :nodoc: to AR::Store::IndifferentCoder [ci skip]Francesco Rodriguez2012-09-081-1/+1
| | | | | | | |
| * | | | | | | add note about using block form of unscoped in AR Querying guide [ci skip]Francesco Rodriguez2012-09-081-5/+19
| | | | | | | |
| * | | | | | | Fix a bunch of typos, reword some things for clarity.Jonathan Roes2012-09-071-43/+36
| | | | | | | |
| * | | | | | | Fix a typo13342012-09-071-2/+2
| | | | | | | |
| * | | | | | | default scope should return an ActiveRecord::Relation [ci skip]José Corcuera2012-09-071-1/+1
| | | | | | | |
| * | | | | | | How to use default_scope as a class methodJosé Corcuera2012-09-071-0/+10
| | | | | | | |
| * | | | | | | Added forgotten :message option to ActiveModel validates documentationAnatoly Makarevich2012-09-071-3/+3
| | | | | | | |
| * | | | | | | Merge pull request #112 from cnaize/mastercnaize2012-09-071-1/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | extended example
| | * | | | | | | extended examplecnaize2012-09-071-1/+4
| |/ / / / / / /
| * | | | | | | Added information about dynamic delivery options to action mailer guidesAditya Sanghi2012-09-071-0/+18
| | | | | | | |
| * | | | | | | Dynamic Delivery Method OptionsAditya Sanghi2012-09-071-0/+14
| | | | | | | |
| * | | | | | | Redirect block with arity of 1 is deprecated.Semyon Perepelitsa2012-09-061-2/+2
| | | | | | | |
| * | | | | | | Fixed non-working around callback exampleAaron Renner2012-09-061-1/+1
| | | | | | | |
| * | | | | | | Doc: sweepers only work on Active Record Modelsschneems2012-09-052-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | In response to this rails issue: https://github.com/rails/rails/issues/3729
| * | | | | | | Fix a typoAndreas Loupasakis2012-09-061-1/+1
| | | | | | | |
| * | | | | | | Fixed array wrongly translated in footnote in a guide [ci skip]Aldo "xoen" Giambelluca2012-09-051-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' noteRyan Bigg2012-09-051-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 ownKonstantin Haase2012-09-041-1/+12
| | | | | | | |
| * | | | | | | Update caching guide: memcache-client was replaced with dalliGuillermo Iguaran2012-09-031-1/+1
| | | | | | | |
| * | | | | | | Add section about tagged loggingGaurish Sharma2012-09-031-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 Dutta2012-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <pre> block.
| * | | | | | | Fixed validation issue and titles in Migrations guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-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" Giambelluca2012-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 12:20:11 +0000