aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7273 from beerlington/foreign_key_model_queriesJon Leighton2012-09-127-5/+158
|\ | | | | Convert model name to foreign key in queries
| * Accept belongs_to assoc. keys in ActiveRecord queriesbeerlington2012-09-117-5/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | Allows you to specify the model association key in a belongs_to relationship instead of the foreign key. The following queries are now equivalent: Post.where(:author_id => Author.first) Post.where(:author => Author.first) PriceEstimate.where(:estimate_of_type => 'Treasure', :estimate_of_id => treasure) PriceEstimate.where(:estimate_of => treasure)
* | Merge pull request #7622 from marcandre/docCarlos Antonio da Silva2012-09-121-8/+2
|\ \ | | | | | | Update documentation for CollectionProxy [ci skip]
| * | 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
| | | | | | | | | | | | default is the SynchronousQueue.
* | | 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
| | | | | | | | | | | | We don't need to rely on rails/queueing in Action Pack tests
* | | Allow users to configure the queue for the mailersRafael Mendonça França2012-09-124-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allow the users to do: config.action_mailer.queue = MyQueue.new and class UsersMailer < ActionMailer::Base self.queue = MyQueue.new end
* | | Use the SynchronousQueue as default in production and development.Rafael Mendonça França2012-09-123-9/+10
|/ / | | | | | | | | We should not let the users use the ThreadedConsumer without know about the risks
* | Merge pull request #7605 from revans/masterCarlos Antonio da Silva2012-09-121-1/+11
|\ \ | | | | | | | | | Add docs to inheritance_column method, explaining how to override it to be able to use the "type" column without STI [ci skip]
| * | Added additional comments on how to use the "type" column withoutRobert Evans2012-09-121-1/+11
| | | | | | | | | | | | | | | single-table inheritance by overriding it in your ActiveRecord Model.
* | | 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 tasks
| * | | fixed support for DATABASE_URL for rake db tasksGrace Liu2012-09-117-32/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added tests to confirm establish_connection uses DATABASE_URL and Rails.env correctly even when no arguments are passed in. - updated rake db tasks to support DATABASE_URL, and added tests to confirm correct behavior for these rake tasks. (Removed establish_connection call from some tasks since in those cases the :environment task already made sure the function would be called) - updated Resolver so that when it resolves the database url, it removes hash values with empty strings from the config spec (e.g. to support connection to postgresql when no username is specified).
* | | | Merge pull request #7612 from arunagw/build_fix_queueCarlos Antonio da Silva2012-09-121-0/+6
|\ \ \ \ | | | | | | | | | | Fix build Rails.queue
| * | | | Fix build Rails.queueArun Agrawal2012-09-121-0/+6
| |/ / / | | | | | | | | | | | | see 34b23e7110a3a13cf157608cefc9b5701017bf39
* | | | Merge pull request #7615 from NARKOZ/patch-2Carlos Antonio da Silva2012-09-121-1/+1
|\ \ \ \ | | | | | | | | | | Remove '.rb' from require call
| * | | | 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.
| * | | 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
| | | | |