aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* Remove old asset_path from rails configJoshua Peek2012-10-151-1/+0
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-111-8/+8
|\ | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev)Robin Dupret2012-10-101-8/+8
| |
| * Revert "Add changelog/release note entries for missing ActionMailer super ↵Aditya Sanghi2012-10-101-3/+0
| | | | | | | | | | | | feature related to inclusion of callbacks in mailers" This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a.
| * Add changelog/release note entries for missing ActionMailer super feature ↵Aditya Sanghi2012-10-101-0/+3
| | | | | | | | related to inclusion of callbacks in mailers
* | Add missing CHANGELOG related to addition of callbacks to mailers.Aditya Sanghi2012-10-101-0/+4
| |
* | Update test locationsMike Moore2012-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional)
* | Update actionmailer with new hash syntax.Kirill Nikitin2012-10-0715-169/+169
| |
* | Merge pull request #7708 from bdurand/optimize_log_subscribersRafael Mendonça França2012-10-011-2/+4
|\ \ | |/ |/| Optimize log subscribers to check if the log level is sufficient
| * Optimize log subscribers to check if the log level is sufficient before ↵Brian Durand2012-09-301-2/+4
| | | | | | | | performing an operations.
* | Support `Mailer.deliver_foo(*args)` as a synonym for ↵Jon Leighton2012-09-283-0/+15
| | | | | | | | | | | | | | `Mailer.foo(*args).deliver`. This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when testing code that calls the mailer.
* | Also includes ConstantLookup dependency for controller and mailer testsAndy Lindeman2012-09-261-0/+1
| |
* | Support mailer tests using spec DSLMike Moore2012-09-242-3/+149
| | | | | | | | | | Improve how mailer tests to resolve mailers from the test name. Add tests for mailer tests using the minitest spec DSL.
* | Register mailer tests for minitest's spec DSLMike Moore2012-09-242-0/+44
| |
* | Revert "update ActionMailer::Base documentation [ci skip]"Rafael Mendonça França2012-09-211-258/+216
| | | | | | | | | | | | | | | | | | | | This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f. Conflicts: actionmailer/lib/action_mailer/base.rb Reason: @frodsan asked me to revert since this change is breaking the documentation in the edge API site
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-216-238/+275
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes.
| * remove nodoc [ci skip]Vijay Dev2012-09-211-1/+1
| |
| * fix Hash#slice code example [ci skip]Francesco Rodriguez2012-09-181-1/+1
| |
| * update ActionMailer documentation [ci skip]Francesco Rodriguez2012-09-175-18/+15
| |
| * update ActionMailer::Base documentation [ci skip]Francesco Rodriguez2012-09-171-266/+323
| |
* | spurious space I saw in passingXavier Noria2012-09-181-1/+1
| |
* | Use synchronous queue by default. Separate queued message delivery jobs from ↵Jeremy Kemper2012-09-165-27/+30
| | | | | | | | the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage).
* | Move queue classes to ActiveSupportSantiago Pastorino2012-09-142-4/+4
| |
* | Updating the documentation to ActionMailer::Base.queueRafael Mendonça França2012-09-121-0/+3
| |
* | Allow users to configure the queue for the mailersRafael Mendonça França2012-09-123-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | This allow the users to do: config.action_mailer.queue = MyQueue.new and class UsersMailer < ActionMailer::Base self.queue = MyQueue.new end
* | Action Mailer async flag is true by default using a Synchronous implSantiago Pastorino2012-09-116-61/+51
|/
* fix bad changelog exampleAditya Sanghi2012-09-071-1/+1
|
* Allow delivery method options to be set per mail instanceAditya Sanghi2012-09-044-3/+58
|
* Added missing require. When performing rake test:isolated, test/base_test.rb ↵kennyj2012-08-291-0/+1
| | | | was break.
* CHANGELOGs are now per branchXavier Noria2012-08-281-533/+1
| | | | | | | | | | Changes in old branches needed to be manually synched in CHANGELOGs of newer ones. This has proven to be brittle, sometimes one just forgets this manual step. With this commit we switch to CHANGELOGs per branch. When a new major version is cut from master, the CHANGELOGs in master start being blank. A link to the CHANGELOG of the previous branch allows anyone interested to follow the history.
* Fixes warnings when executing rake test in ActionMailer. Related to ↵kennyj2012-08-291-1/+1
| | | | 582a7f459990487659886b90e54c22e055c65870
* Fix ActionMailer tests that depend on run orderFrancesco Rodriguez2012-08-231-5/+9
|
* Get rid of config.preload_frameworks in favor of config.eager_load_namespacesJosé Valim2012-08-212-1/+5
| | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly.
* Sync CHANGELOGs [ci skip]Rafael Mendonça França2012-08-111-0/+16
|
* Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"José Valim2012-08-074-23/+3
| | | | | | Reverting because it feels backward to specify a delivery to not be performed while the e-mail is being composed. It is simpler (and makes more sense) to delegate the responsibility to the calling code.
* add changelog for #7202Aditya Sanghi2012-08-071-0/+7
|
* Merge pull request #7202 from asanghi/perform_deliveries_in_mailJosé Valim2012-08-043-3/+16
|\ | | | | Allow perform_deliveries to be set within mailer action
| * allow perform deliveries to be set within mailer actionAditya Sanghi2012-07-303-3/+16
| |
* | load active_support/core_ext/module/delegation in active_support/railsXavier Noria2012-08-021-1/+0
| |
* | load active_support/core_ext/class/attribute in active_support/railsXavier Noria2012-08-021-1/+0
| |
* | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-022-2/+0
| |
* | defines a private require-hub active_support/railsXavier Noria2012-08-021-0/+1
|/ | | | | | | | This is a private place to put those AS features that are used by every component. Nowadays we cherry-pick individual files wherever they are used, but that it is not worth the effort for stuff that is going to be loaded for sure sooner or later, like blank?, autoload, concern, etc.
* Fix failing AM test due to missing templateCarlos Antonio da Silva2012-07-061-1/+1
|
* Improve docs, changelog and release notes for Action Mailer default_options=Carlos Antonio da Silva2012-07-062-4/+10
| | | | [ci skip]
* Merge pull request #6950 from paneq/default_from2Carlos Antonio da Silva2012-07-063-1/+19
|\ | | | | | | | | | | | | | | | | | | Introduce config.action_mailer.default_options= Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = { from: "no-replay@example.org" } Closes #6747
| * Introduce config.action_mailer.default_from=Robert Pankowecki2012-07-033-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to easily set :from, :replay_to, etc. options in config/application.rb using simple syntax: config.action_mailer.default_options = {from:"no-replay@example.org"} This was not possible using #default method because config.action_mailer.default(from: "no-replay@example.org") is interpreated as reader method and just returns nil. It would not call ActionMailer::Base.default method. The only way of calling this method from config/application.rb was to use the direct syntax which looks ugly in my opinion: config.assets.enabled = false config.assets.version = '1.0' config.encoding = "utf-8" config.action_mailer.default_url_options= { host:"example.org", protocol:"https" } ActionMailer::Base.default(from: "no-replay@example.org")
* | Use ArgumentError vs. RuntimeError, which is more precise.Mark Dodwell2012-07-041-1/+1
|/
* fix ActionMailer::Async docs and update to follow coding conventionsFrancesco Rodriguez2012-06-282-31/+33
|
* Some final syntax fixesBrian Cardarella2012-06-242-3/+2
|
* Better documentation for ActionMailer.asyncBrian Cardarella2012-06-241-2/+2
|