aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7614 from frodsan/scm_agnosticRafael Mendonça França2012-09-126-65/+90
|\
| * change app/plugin generators to be more SCM agnosticDerek Prior2012-09-126-65/+90
|/
* Pass in the model class rather than engineJon Leighton2012-09-133-8/+8
* Refactor to remove some duplicationJon Leighton2012-09-122-37/+24
* Fix nested association referencesJon Leighton2012-09-123-41/+36
* Merge pull request #7273 from beerlington/foreign_key_model_queriesJon Leighton2012-09-127-5/+158
|\
| * Accept belongs_to assoc. keys in ActiveRecord queriesbeerlington2012-09-117-5/+158
* | Merge pull request #7622 from marcandre/docCarlos Antonio da Silva2012-09-121-8/+2
|\ \
| * | Update documentation for CollectionProxyMarc-Andre Lafortune2012-09-121-8/+2
* | | Remove the queue configuration from the environments templates since theRafael Mendonça França2012-09-122-4/+1
* | | Updating the documentation to ActionMailer::Base.queueRafael Mendonça França2012-09-123-4/+16
* | | Define a SynchronousQueue for test in Action Pack.Rafael Mendonça França2012-09-122-6/+10
* | | Allow users to configure the queue for the mailersRafael Mendonça França2012-09-124-13/+22
* | | Use the SynchronousQueue as default in production and development.Rafael Mendonça França2012-09-123-9/+10
|/ /
* | Merge pull request #7605 from revans/masterCarlos Antonio da Silva2012-09-121-1/+11
|\ \
| * | Added additional comments on how to use the "type" column withoutRobert Evans2012-09-121-1/+11
* | | Merge pull request #7521 from graceliu/fix_database_url_supportRafael Mendonça França2012-09-127-32/+275
|\ \ \
| * | | fixed support for DATABASE_URL for rake db tasksGrace Liu2012-09-117-32/+275
* | | | Merge pull request #7612 from arunagw/build_fix_queueCarlos Antonio da Silva2012-09-121-0/+6
|\ \ \ \
| * | | | Fix build Rails.queueArun Agrawal2012-09-121-0/+6
| |/ / /
* | | | Merge pull request #7615 from NARKOZ/patch-2Carlos Antonio da Silva2012-09-121-1/+1
|\ \ \ \
| * | | | remove '.rb' from require callNihad Abbasov2012-09-121-1/+1
| |/ / /
* | | | Merge pull request #7610 from arunagw/warning_removed_action_packJosé Valim2012-09-122-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | warning removed.Arun Agrawal2012-09-122-2/+0
|/ / /
* | | 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, 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