Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Pass in the model class rather than engine | Jon Leighton | 2012-09-13 | 3 | -8/+8 | |
* | | | | | | | Refactor to remove some duplication | Jon Leighton | 2012-09-12 | 2 | -37/+24 | |
* | | | | | | | Fix nested association references | Jon Leighton | 2012-09-12 | 3 | -41/+36 | |
* | | | | | | | Merge pull request #7273 from beerlington/foreign_key_model_queries | Jon Leighton | 2012-09-12 | 7 | -5/+158 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Accept belongs_to assoc. keys in ActiveRecord queries | beerlington | 2012-09-11 | 7 | -5/+158 | |
* | | | | | | | | Merge pull request #7622 from marcandre/doc | Carlos Antonio da Silva | 2012-09-12 | 1 | -8/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update documentation for CollectionProxy | Marc-Andre Lafortune | 2012-09-12 | 1 | -8/+2 | |
* | | | | | | | | | Remove the queue configuration from the environments templates since the | Rafael Mendonça França | 2012-09-12 | 2 | -4/+1 | |
* | | | | | | | | | Updating the documentation to ActionMailer::Base.queue | Rafael Mendonça França | 2012-09-12 | 3 | -4/+16 | |
* | | | | | | | | | Define a SynchronousQueue for test in Action Pack. | Rafael Mendonça França | 2012-09-12 | 2 | -6/+10 | |
* | | | | | | | | | Allow users to configure the queue for the mailers | Rafael Mendonça França | 2012-09-12 | 4 | -13/+22 | |
* | | | | | | | | | Use the SynchronousQueue as default in production and development. | Rafael Mendonça França | 2012-09-12 | 3 | -9/+10 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #7605 from revans/master | Carlos Antonio da Silva | 2012-09-12 | 1 | -1/+11 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Added additional comments on how to use the "type" column without | Robert Evans | 2012-09-12 | 1 | -1/+11 | |
* | | | | | | | | | Merge pull request #7521 from graceliu/fix_database_url_support | Rafael Mendonça França | 2012-09-12 | 7 | -32/+275 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fixed support for DATABASE_URL for rake db tasks | Grace Liu | 2012-09-11 | 7 | -32/+275 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #7612 from arunagw/build_fix_queue | Carlos Antonio da Silva | 2012-09-12 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix build Rails.queue | Arun Agrawal | 2012-09-12 | 1 | -0/+6 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #7615 from NARKOZ/patch-2 | Carlos Antonio da Silva | 2012-09-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | remove '.rb' from require call | Nihad Abbasov | 2012-09-12 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #7610 from arunagw/warning_removed_action_pack | José Valim | 2012-09-12 | 2 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | warning removed. | Arun Agrawal | 2012-09-12 | 2 | -2/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Action Mailer async flag is true by default using a Synchronous impl | Santiago Pastorino | 2012-09-11 | 10 | -79/+61 | |
* | | | | | | | | Merge pull request #7601 from jrochkind/connection_pool_unify_exceptions | Aaron Patterson | 2012-09-11 | 2 | -18/+12 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | ConnectionPool, unify exceptions, ConnectionTimeoutError | Jonathan Rochkind | 2012-09-11 | 2 | -18/+12 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #7564 from kennyj/using_mysqldump | Carlos Antonio da Silva | 2012-09-11 | 3 | -28/+30 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Use configuration['encoding'], because database configuration use not charset... | kennyj | 2012-09-12 | 2 | -5/+5 | |
| * | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Support MySQL SSL in rails dbconsole. | needfeed | 2012-09-10 | 2 | -1/+9 | |
* | | | | | | | Merge pull request #7569 from skorfmann/improve-has-many-through-exception-me... | Carlos Antonio da Silva | 2012-09-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Improve exception message for HasManyThroughAssociationPolymorphicSourceError | Sebastian Korfmann | 2012-09-10 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #7594 from guilleiguaran/rb-template-handler | Rafael Mendonça França | 2012-09-10 | 4 | -0/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add .rb template handler | Guillermo Iguaran | 2012-09-11 | 4 | -0/+14 | |
* | | | | | | | | | 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. | Dmitry Vorotilin | 2012-09-11 | 1 | -7/+4 | |
* | | | | | | | | | Merge pull request #7592 from bogdan/callbacks-changelog | José Valim | 2012-09-10 | 1 | -19/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Revert "Changelog entry for PR #7560" | Bogdan Gusiev | 2012-09-10 | 1 | -19/+0 | |
* | | | | | | | | | | Merge pull request #7591 from bogdan/callbacks-changelog | José Valim | 2012-09-10 | 1 | -0/+19 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | ' 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 |