aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7601 from jrochkind/connection_pool_unify_exceptionsAaron Patterson2012-09-112-18/+12
|\
| * ConnectionPool, unify exceptions, ConnectionTimeoutErrorJonathan Rochkind2012-09-112-18/+12
* | Merge pull request #7564 from kennyj/using_mysqldumpCarlos Antonio da Silva2012-09-113-28/+30
|\ \ | |/ |/|
| * Use configuration['encoding'], because database configuration use not charset...kennyj2012-09-122-5/+5
| * 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
|\
| * Support MySQL SSL in rails dbconsole.needfeed2012-09-102-1/+9
* | Merge pull request #7569 from skorfmann/improve-has-many-through-exception-me...Carlos Antonio da Silva2012-09-111-1/+1
|\ \
| * | Improve exception message for HasManyThroughAssociationPolymorphicSourceErrorSebastian Korfmann2012-09-101-1/+1
* | | Merge pull request #7594 from guilleiguaran/rb-template-handlerRafael Mendonça França2012-09-104-0/+14
|\ \ \
| * | | Add .rb template handlerGuillermo Iguaran2012-09-114-0/+14
* | | | 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.Dmitry Vorotilin2012-09-111-7/+4
* | | | Merge pull request #7592 from bogdan/callbacks-changelogJosé Valim2012-09-101-19/+0
|\ \ \ \
| * | | | Revert "Changelog entry for PR #7560"Bogdan Gusiev2012-09-101-19/+0
* | | | | Merge pull request #7591 from bogdan/callbacks-changelogJosé Valim2012-09-101-0/+19
|\| | | |
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * | | &#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
|\ \ \
| * | | 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 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
| * | | 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
| * | | Add giant belongs_to 'please don't pluralize me' noteRyan Bigg2012-09-051-0/+2
| * | | 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
| * | | Fix indenentation in comment to stop the end of comment from appearing in a <...Anuj Dutta2012-09-031-1/+1
| * | | Fixed validation issue and titles in Migrations guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-6/+6
| * | | Fixed validation issue related to taken ID in Layout and Rendering guide [ci ...Aldo "xoen" Giambelluca2012-09-021-1/+1
| * | | Fixed validation issues in the "Configuring Rails Applications" guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-1/+1
| * | | Fixed validation issues related to taken IDs in AR Querying guide [ci skip]Aldo "xoen" Giambelluca2012-09-021-4/+4