Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 6 | -8/+64 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb | ||||
| * | removing text-format in favor of a more simple solution | Aaron Patterson | 2011-02-09 | 1 | -2/+1 |
| | | |||||
| * | Solve SystemStackError when changing locale inside ActionMailer [#5329 ↵ | José Valim | 2011-01-19 | 1 | -10/+6 |
| | | | | | | | | state:resolved] | ||||
| * | Added a testcase for bug [#5329] | Frank Fischer | 2011-01-19 | 2 | -0/+54 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | turn off deprecation silencing | Aaron Patterson | 2011-01-12 | 1 | -1/+8 |
|/ | |||||
* | Remove old workaround for mocha bug. [#3886 state:committed] | James Mead | 2010-10-08 | 1 | -4/+1 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fix action mailer tests after old mapper removal | Piotr Sarnacki | 2010-09-05 | 1 | -5/+3 |
| | |||||
* | Deprecate the old mailer API that was not deprecated yet. | José Valim | 2010-08-29 | 10 | -80/+40 |
| | |||||
* | Remove the deprecated API from ActionMailer. | José Valim | 2010-08-29 | 2 | -119/+1 |
| | |||||
* | Ensure templates like template.html are found but still uses the proper ↵ | José Valim | 2010-08-26 | 3 | -0/+11 |
| | | | | virtual path. | ||||
* | Silence warnings for Encoding.default_external= and Encoding.default_internal= | Santiago Pastorino | 2010-08-22 | 1 | -3/+6 |
| | |||||
* | Set default_internal and default_external on AM for testing purposes | Santiago Pastorino | 2010-08-21 | 1 | -1/+8 |
| | |||||
* | Fixes some ActionMailer tests | Santiago Pastorino | 2010-08-14 | 3 | -4/+4 |
| | |||||
* | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 19 | -61/+61 |
| | | | | 's/[ \t]*$//' -i {} \;) | ||||
* | Reload action_methods in AbstractController after defining new method. | Piotr Sarnacki | 2010-08-04 | 1 | -0/+12 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Move config_accessor :asset_host from ActionController::Base to ↵ | Jeroen van Dijk and Josh Kalderimis | 2010-07-24 | 5 | -129/+165 |
| | | | | | | | | AbstractController which fixes issues with asset_host in ActionMailer Including: - Moved mailer objects in separate directory - Added two tests for asset_host configuration option | ||||
* | Avoids deprecation warning running tests | Santiago Pastorino | 2010-07-04 | 1 | -5/+7 |
| | |||||
* | Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfo | Santiago Pastorino | 2010-07-02 | 1 | -0/+1 |
| | | | | | | [#4979 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵ | José Valim | 2010-06-24 | 1 | -4/+4 |
| | | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved] | ||||
* | Fixes encoding mistakes on old_base/mail_service tests | Santiago Pastorino | 2010-06-23 | 1 | -3/+3 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Move ActionMailer::TC to AV::TC::Behavior | David Chelimsky | 2010-06-12 | 1 | -0/+2 |
| | | | | | | [#4843 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | subject is automatically looked up on I18n using mailer_name and action_name ↵ | José Valim | 2010-06-12 | 1 | -1/+1 |
| | | | | as scope as in t('.subject') | ||||
* | Adding inline attachment support to ActionMailer | Mikel Lindsaar | 2010-06-07 | 3 | -0/+26 |
| | |||||
* | Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit) | Mikel Lindsaar | 2010-06-07 | 1 | -3/+3 |
| | |||||
* | Use better assertion methods for testing | Neeraj Singh | 2010-05-19 | 5 | -20/+20 |
| | | | | | | [#4645 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Use assert_equal correctly in actionmailer test (exposing one as broken) | Neeraj Singh | 2010-05-18 | 1 | -2/+3 |
| | | | | | | [#4626 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Changed encoding behaviour of mail, so updated tests in actionmailer and ↵ | Mikel Lindsaar | 2010-05-14 | 1 | -3/+3 |
| | | | | | | bumped mail version to 2.2.1 Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Adding ability for the procs to be called within the instance, allows you to ↵ | Mikel Lindsaar | 2010-05-02 | 1 | -1/+14 |
| | | | | | | pass results from instance methods to the mail header Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Adding ability to pass proc's to the ActionMailer class default method | Mikel Lindsaar | 2010-05-02 | 1 | -0/+17 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Use explicit source encoding rather than forced UTF-8 from US-ASCII. | Santiago Pastorino | 2010-04-26 | 1 | -2/+0 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | template_name and template_path should not be added to mail headers. | José Valim | 2010-04-13 | 1 | -5/+5 |
| | |||||
* | New mail is more intelligent on encoding and decoding | Mikel Lindsaar | 2010-04-11 | 1 | -3/+3 |
| | |||||
* | Cleaning up expectations from the new way mail does it | Mikel Lindsaar | 2010-04-11 | 1 | -3/+3 |
| | |||||
* | Moved test of QP into mail | Mikel Lindsaar | 2010-04-11 | 1 | -4/+0 |
| | |||||
* | Don't need no quoting test, done in mail | Mikel Lindsaar | 2010-04-11 | 1 | -106/+0 |
| | |||||
* | Mail::Part now no longer has nil as a default charset, it is always set to ↵ | Mikel Lindsaar | 2010-04-11 | 1 | -1/+1 |
| | | | | something, and defaults to UTF-8 | ||||
* | Fixing up some bad test cases | Mikel Lindsaar | 2010-04-11 | 1 | -3/+3 |
| | |||||
* | Removing quoting.rb, upgrade to 2.1.3.6, changing all utf-8 references to ↵ | Mikel Lindsaar | 2010-04-11 | 3 | -41/+47 |
| | | | | UTF-8, updating tests where incorrect encoding | ||||
* | Fixing up attachment encoding specs to work with latest mail - and be correct | Mikel Lindsaar | 2010-03-28 | 1 | -2/+18 |
| | |||||
* | Mail now correctly bundles up the charset into the content type field | Mikel Lindsaar | 2010-03-28 | 1 | -7/+7 |
| | |||||
* | Updating test, should be calling :decoded, not :encoded, is a problem now ↵ | Mikel Lindsaar | 2010-03-28 | 1 | -1/+1 |
| | | | | that Mail is fixed | ||||
* | Fixing test, ; is a delimiter, not a termination character, ref RFC 2045 | Mikel Lindsaar | 2010-03-28 | 1 | -2/+2 |
| | |||||
* | Fix ActionMailer test issues | Evan Phoenix | 2010-03-22 | 1 | -2/+4 |
| | | | | | * Don't depend so much no the message in a NameError * Reset the delivery method properly | ||||
* | Improve performance of the rendering stack by freezing formats as a sign ↵ | José Valim | 2010-03-19 | 3 | -44/+37 |
| | | | | that they shouldn't be further modified. | ||||
* | Fix an error in isolated running of tests | Carlhuda | 2010-03-18 | 1 | -8/+0 |
| | |||||
* | Fix broken test due to constant collision | Jeremy Kemper | 2010-03-17 | 2 | -6/+4 |
| | |||||
* | Kill nonexistent method removal | Jeremy Kemper | 2010-03-17 | 1 | -2/+0 |
| | |||||
* | Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵ | wycats | 2010-03-17 | 1 | -0/+2 |
| | | | | warnings are in dependencies. | ||||
* | Eliminate warnings for AM on 1.8 | wycats | 2010-03-16 | 2 | -1/+22 |
| | |||||
* | Finish cleaning up rendering stack from views and move assigns evaluation to ↵ | José Valim | 2010-03-12 | 2 | -3/+2 |
| | | | | controller (so plugins and/or controllers can overwrite just one method). |