| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage).
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allow the users to do:
config.action_mailer.queue = MyQueue.new
and
class UsersMailer < ActionMailer::Base
self.queue = MyQueue.new
end
|
|/ |
|
| |
|
|
|
|
| |
582a7f459990487659886b90e54c22e055c65870
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
|\
| |
| | |
Allow perform_deliveries to be set within mailer action
|
| | |
|
| | |
|
| | |
|
| | |
|
|/
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
[ci skip]
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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")
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Credit goes to *Aaron Patterson* (tenderlove)
|
| |
|
|
|
|
| |
Credit goes to *Nicolás Sanguinetti* (foca) for this suggestion
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Any ActionMailer class can be set to render and delier messages using
the new Rails Queue.
Some of this work was borrowed (with permission) from Nick Plante's
(zapnap) reqsue_mailer gem.
|
|\ |
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
closes #5970
|
| |
|
|
|
|
| |
one.
|
| |
|
|
|
|
|
|
|
|
| |
The latter doesn't render as code in HTML output.
Regex used in Rubymine to locate the latter form:
(\+)(:*\w+:(?::|\w)+)(\+)
|
| |
|
| |
|
|
|
|
| |
the 1.9 hash syntax in the generators.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
AbstractController::Callbacks.
Prior to this commit, there isn't a good way of adding things like
default inline attachments to an email. This Stack Overflow thread
shows people using hooks like the 'default' method in ActionMailer::Base
to call a Proc for message configuration:
http://stackoverflow.com/questions/5113121/rails-use-same-attachment-for-all-emails-using-layout
This has the unintended side effect of setting a message header, so it's not a good solution.
This pull request adds support for message modifications by including AbstractController:Callbacks
in ActionMailer::Base. It includes tests and documentation for the functionality
provided by including this module.
|
|
|
|
|
|
| |
is being rendered
Closes #5025 part 2
|