Daniel Schierbeck
8f0c5e00ff
Instrument the generation of Action Mailer messages
...
The processing of outbound mail is instrumented with the key
`process.action_mailer`. The payload includes the mailer name as well as
the mailer method.
2013-10-20 15:21:15 +02:00
Vipul A M
f72437bf3f
Remove extra variable creation and merge.
2013-10-20 10:31:41 +05:30
Waynn Lue
ba46d524db
take out reference to previous versions of Rails
2013-09-12 14:44:38 -07:00
claudiob
d17333d10c
Remove unused raw email fixtures
...
The tests that used the raw_email_* fixtures were removed in d500ad3
2013-09-12 01:09:32 -07:00
Steve Klabnik
db2c4abca6
Merge pull request #12184 from waynn/patch-4
...
"previous version of Rails" is gramatically incorrect
2013-09-10 18:55:29 -07:00
Waynn Lue
e2c17ff3ec
[ci skip] 'previous version of Rails' is gramatically incorrect
2013-09-10 16:15:41 -07:00
Akira Matsuda
0c93a48904
Don't mutate the Base settings by merge!ing the given value
2013-09-10 18:10:48 +02:00
Łukasz Strzałkowski
40fcb9e822
Revert "Port all remaining self.protected_instance_variables to class methods"
...
This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
2013-09-02 23:18:02 +02:00
Łukasz Strzałkowski
7de994fa21
Port all remaining self.protected_instance_variables to class methods
2013-08-29 12:13:45 +02:00
Łukasz Strzałkowski
0d43df7ebf
Make AV dependency for ActionMailer
2013-08-26 10:54:38 +02:00
Łukasz Strzałkowski
e868441896
Remove hard require to ActionView from ActionMailer
2013-08-25 11:39:12 +02:00
Łukasz Strzałkowski
9e6a1439d1
Require log_subscriber
2013-08-25 11:39:12 +02:00
Łukasz Strzałkowski
e29c1b3103
Remove dependency on AV
2013-08-25 11:39:12 +02:00
Łukasz Strzałkowski
d1760253f5
Load AV::Layout to AM::Base in railties
2013-08-25 11:39:11 +02:00
Łukasz Strzałkowski
2a25c4ce6d
Do not silance mail gem warnings.
...
I doesn't have any at the moment
2013-08-25 11:39:11 +02:00
Łukasz Strzałkowski
3419ac26e9
Include AbsC::Rendering interface in ActionMailer
2013-08-25 11:39:09 +02:00
Łukasz Strzałkowski
75d38e4364
Do not include AV::Rendering
...
It's already included in Layouts, makes no sense to doubly include it
2013-08-25 11:39:08 +02:00
Łukasz Strzałkowski
8e5a7243a1
Integrate ActionMailer with ActionView
2013-08-25 11:39:08 +02:00
Vijay Dev
9abe72c760
Merge branch 'master' of github.com:rails/docrails
...
Conflicts:
actionview/README.rdoc
activerecord/lib/active_record/migration.rb
guides/source/development_dependencies_install.md
guides/source/getting_started.md
2013-08-17 21:49:16 +05:30
Vijay Dev
ec8ef1e105
Revert "Merge branch 'master' of github.com:rails/docrails"
...
This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing
changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9.
Seems to be a code merge done by mistake.
2013-08-17 21:46:39 +05:30
Rafael Mendonça França
4c743fd682
Merge pull request #11722 from arunagw/removed-deprecation-silenced-from-test
...
As we are doing debug mode on
2013-08-02 12:13:38 -07:00
Arun Agrawal
7e893717aa
As we are doing debug mode on
...
we don't need to silenced it
2013-08-02 14:34:15 -04:00
Rajarshi Das
938481010a
map => map! for stopping extra array creation
2013-08-02 18:04:34 +05:30
Arun Agrawal
f52832de2a
grab executable from rubygems
...
As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
2013-07-26 11:07:25 +02:00
Akira Matsuda
64202abc3d
Don't mutate the Base settings by merge!ing the given value
2013-07-26 04:04:51 +09:00
Alex Tsukernik
49185875a5
don't convert mailer default values to procs
...
Invoke mailer defaults as procs only if they are procs, do not convert
with to_proc. That an object is convertible to a proc does not mean it's
meant to be always used as a proc. Fixes #11533
2013-07-22 14:25:20 -04:00
Carlos Antonio da Silva
f02d4ddc99
Merge pull request #11046 from arunagw/verbose_mode_on
...
Verbose mode on when running tests
2013-06-25 15:15:43 -07:00
Arun Agrawal
d88b390dfd
Adding verbose in isolated test.
2013-06-21 14:14:36 +02:00
Arun Agrawal
67f668845e
Saying gemcutter => rubygems [ci skip]
2013-06-21 11:04:52 +02:00
Arun Agrawal
a84a08ecea
No need to load 'rake/packagetask' as it's already
...
in 'rubygems/package_task'
2013-06-02 20:41:21 +02:00
Rafael Mendonça França
97a607b32b
No need CHANGELOG entry for a test fix
...
[ci skip]
2013-05-20 15:17:11 -03:00
Rafael Mendonça França
364d6374f6
Merge pull request #10646 from kennyj/fix_am_20130517
...
Fix ActionMailer testcase break with mail 2.5.4.
2013-05-20 11:15:46 -07:00
Vijay Dev
d71b0935a9
Merge branch 'master' of github.com:lifo/docrails
2013-05-19 21:40:12 +05:30
Vijay Dev
c62b7c1f07
Revert "ActionMailer::Collector should be nodoc'd"
...
This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f.
Reason: Let's not nodoc without reason.
[ci skip]
2013-05-19 21:06:38 +05:30
Vijay Dev
99819d3c8e
Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"
...
This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa.
Reason: Let's not nodoc without reason.
[ci skip]
2013-05-19 21:06:06 +05:30
Vijay Dev
84d3f7bd09
Revert "Document Rails::Generators::MailerGenerator"
...
This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364.
Reason: Let's not nodoc without reason.
[ci skip]
2013-05-19 21:05:35 +05:30
Megan Bowra-Dean
94b97f6154
Fix documentation for ActionMailer template names.
...
ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name.
2013-05-17 17:48:25 +12:00
kennyj
98849c71ac
Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong.
2013-05-17 09:44:01 +09:00
Zachary Scott
dfb69f2b8a
Document Rails::Generators::MailerGenerator
2013-05-15 00:48:31 -04:00
Zachary Scott
328e876a15
nodoc ActionMailer module from lib/action_mailer/*.rb
2013-05-15 00:38:51 -04:00
Zachary Scott
98d81def34
Document ActionMailer::MailHelper
2013-05-15 00:36:07 -04:00
Zachary Scott
41c3670fab
Document ActionMailer::LogSubscriber and ActionMailer::DeliveryMethods::ClassMethods
2013-05-15 00:19:38 -04:00
Zachary Scott
e47c85c696
ActionMailer::Collector should be nodoc'd
2013-05-15 00:17:37 -04:00
Mikel Lindsaar
e100d1e489
Update mail to minimum version 2.5.4
2013-05-14 15:00:44 +10:00
Vipul A M
1ed6ff1006
Extract variable out of loop
2013-05-13 09:20:19 +05:30
Zachary Scott
d790b50db4
Document ActionMailer::Base#set_content_type
2013-05-12 22:27:40 -04:00
Zachary Scott
f65f4fa538
RDoc style for ActionMailer::Base#mail
2013-05-10 00:20:20 -04:00
Zachary Scott
0d7daf24df
Document ActionMailer::Base::default, ::mailer_name, and #mailer_name
2013-05-10 00:07:20 -04:00
Hendy Tanata
b245287bc5
Fix grammar on AM.mailer_name documentation.
2013-05-06 17:02:53 -07:00
Prem Sichanugrist
58533dc9bd
Add some documentation for AM.mailer_name
2013-05-03 13:33:10 -04:00
Vijay Dev
7ead1d8143
Merge branch 'master' of github.com:lifo/docrails
2013-05-01 16:24:13 +05:30
Rafael Mendonça França
feb44b9213
rails/master is now 4.1.0.beta
2013-04-29 13:15:24 -03:00
David Heinemeier Hansson
1ec64297f9
Bump version to rc1
2013-04-29 08:29:18 -07:00
Alexey Vakhov
e1df81c205
Remove superfluous self.
in Action Mailer mail method documetation
...
Notation with `self` was sugestted at 0b05acd, when self.defaults was
extlib_inheritable_accessor. But now all Action Mailer examples are
without this self. It's nicer.
2013-04-23 10:31:35 +04:00
Alexey Vakhov
a145c1b4af
Cosmetic fixes in AM::Base docs. Missed spaces in OpenSSL constants enumerations.
...
Injected at a1639ad.
2013-04-23 10:10:21 +04:00
Alexey Vakhov
98ed2d43c4
Make AM readme example more consistent
...
At 4a6eba32 mail sending example was rewrited from rails 2 format to
modern rails 3 approach. But passing parameter `recipient` to method
Notifier#welcome was lost.
Passing email as parameter makes this example more solid.
2013-04-22 14:44:06 +04:00
Waynn Lue
bbcc2126c6
took out unnecessary wordage, changed "number" to "amount"
2013-04-15 16:35:25 -07:00
Xavier Noria
e79d2c8aa6
copy-edit pass in AM changelog [ci skip]
2013-04-09 22:41:03 +02:00
Rafael Mendonça França
6e170e1b71
Merge pull request #10004 from choudhuryanupam/master
...
Refactored to remove unnecessary setup
2013-03-30 09:46:09 -07:00
Vijay Dev
6d8c070821
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
activerecord/test/cases/adapter_test.rb
guides/source/testing.md
[ci skip]
2013-03-30 15:46:14 +05:30
Anupam Choudhury
2ff2f839ca
Refactored to remove unnecessary setup
2013-03-30 13:16:31 +05:30
Charlie Somerville
c07e1515f7
Add version method to top level modules
2013-03-21 19:56:07 +11:00
Vipul A M
6893c23f48
drop an unused hash; change slang to SPECIAL
2013-03-19 11:00:01 +05:30
Waynn Lue
f1563f4226
"overwritten" is one word
2013-03-18 15:47:41 -07:00
Xavier Noria
ddd2c75b26
Revert "instruct RDoc to only parse Ruby files under lib [ Fixes #9779 ]"
...
This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
2013-03-18 21:19:47 +01:00
Xavier Noria
c24528fbc9
instruct RDoc to only parse Ruby files under lib [ Fixes #9779 ]
2013-03-18 20:36:32 +01:00
Waynn Lue
dbafd36a2d
update README since email-service isn't a word
2013-03-11 15:41:44 -07:00
Yves Senn
a58e660837
Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].
2013-03-09 20:57:17 +01:00
Rafael Mendonça França
0f75e2c51f
Update CHANGELOGS
2013-02-26 13:45:57 -03:00
David Heinemeier Hansson
c0bc9ce38c
Preparing for 4.0.0.beta1 release
2013-02-25 08:31:50 -06:00
Carlos Antonio da Silva
744307e525
Send paths argument as an array rather than converting it internally
2013-01-28 23:25:03 -02:00
Olek Janiszewski
57bfbc249e
Allow passing interpolations to #default_i18n_subject
, e.g.:
...
# config/locales/en.yml
en:
user_mailer:
welcome:
subject: 'Hello, %{username}'
# app/mailers/user_mailer.rb
class UserMailer < ActionMailer::Base
def welcome(user)
mail(subject: default_i18n_subject(username: user.name))
end
end
2013-01-24 15:29:24 +01:00
Trung Lê
21df476f4c
Use Rails 4 find_by in README [ci skip]
2013-01-15 04:21:03 +00:00
Jon Leighton
15b7482dfc
Merge pull request #8568 from inossidabile/fix-in_clause_length
...
Correct source for in_clause_length for eager loading (Fix for #8474 )
2013-01-11 01:34:43 -08:00
Vijay Dev
f049016cd3
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
guides/source/getting_started.md
2013-01-09 01:04:15 +05:30
Akira Matsuda
930646b604
Update mailer generator USAGE
...
* it does not generate fixtures
* it generates .text.erb templates
2013-01-06 15:41:00 +09:00
Robin Dupret
975493a172
Fix missing spaces before and after equal signs in method definitions
2013-01-03 22:14:09 +01:00
Akira Matsuda
db4af11304
deliver_ is an old API
2013-01-04 04:54:39 +09:00
Andrew Nesbitt
d814284506
Updated copyright notices for 2013
2012-12-31 20:35:29 +00:00
Rafael Mendonça França
d4c94accf7
Remove unneeded tests
...
These tests are needed only if we are using MiniTest::Spec
2012-12-31 13:57:24 -03:00
Rafael Mendonça França
5da4d5142a
Add active_support/testing/autorun
...
minitest/autorun load minitest/spec polluting the global namespace with
the DSL that we don't want on Rails
2012-12-31 13:57:24 -03:00
Rafael Mendonça França
eb4930e3c7
Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec
2012-12-31 13:57:23 -03:00
Jeremy Kemper
f9da785d0b
Move background jobs to the 'jobs' branch until fully baked. Not shipping with Rails 4.0.
2012-12-21 16:29:47 -08:00
Boris Staal
1a7567d2af
Eager loading made to use relation's in_clause_length instead of host's one ( fixes #8474 )
2012-12-20 19:51:25 +07:00
Carlos Antonio da Silva
42b555dcf3
Fix Action Mailer changelog indenation to match other changelogs
...
Also some minor improvements to other changelogs. [ci skip]
2012-12-19 23:09:04 -02:00
Vijay Dev
5cc178a291
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
actionpack/lib/action_view/helpers/form_helper.rb
railties/lib/rails/info_controller.rb
2012-12-15 21:20:28 +05:30
Carlos Antonio da Silva
df9f9b7f3e
Convert changelogs to 1.9 hash style and fix some formatting [ci skip]
2012-12-14 20:25:22 -02:00
Carlos Antonio da Silva
2125a6a27f
Remove not used variable warnings from AM and AC
2012-12-11 23:57:56 -02:00
Rafael Mendonça França
287a8d878c
Merge pull request #8450 from senny/8448_mailer_return_values
...
the return value of mailer methods should not be relevant
2012-12-10 06:40:33 -08:00
Yves Senn
ec3429a3d6
The return value from mailer methods is not relevant.
2012-12-10 09:10:47 +01:00
Jeremy Kemper
8110035623
Revert "Omit directories from gemspec.files for RubyGems 2 compat."
...
Obviated by rubygems/rubygems@486ed83cc8
This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25.
2012-12-09 17:14:27 -07:00
Francesco Rodriguez
4d6a314a22
use default_options= instead of default to avoid confusion
2012-12-09 00:01:28 -05:00
Jeremy Kemper
bb8923dee0
Omit directories from gemspec.files for RubyGems 2 compat.
...
RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir.
May revert if rubygems/rubygems#413 is accepted.
2012-12-08 17:18:46 -07:00
Francesco Rodriguez
4ec7493e3c
use _action callbacks in actionmailer
2012-12-08 10:21:20 -05:00
Vijay Dev
40e16121c0
Merge branch 'master' of github.com:lifo/docrails
...
Conflicts:
guides/source/migrations.md
2012-12-04 22:26:16 +05:30
Jeremy Kemper
c7e4ee7932
Bump mailer to quiet the stdout log messages
2012-12-03 20:48:37 -07:00
Alvaro Pereyra
4940d6d096
Cleans and removes useless 'Examples' tag [ci skip]
2012-12-01 15:19:45 -05:00
Santiago Pastorino
544b5ee48b
Tiny refactor
2012-11-29 09:53:25 -02:00
Nate Berkopec
9cf33b55f3
Explicit multipart messages respect :parts_order
...
As issue #7978 , the order in which ActionMailer
sends multipart messages could be unintentionally
overwritten if a block is passed to the mail
method. This changes the mail method such that
:parts_order is always respected, regardless of
whether a block is passed to mail.
2012-11-19 11:27:22 -05:00
Yves Senn
1f1ccbcee5
make ActionMailer::QueuedMessage autoloadable
2012-11-18 14:28:50 +01:00