Jeremy Kemper
8d2ca7dde1
Merge branch 'master' of git@github.com:rails/rails
2008-11-25 18:48:46 -08:00
Joshua Peek
759183c822
Ensure ActionView will be available to ActionMailer if ActionController is not loaded
2008-11-25 10:38:20 -06:00
Jeremy Kemper
6482db8669
Explicitly require Action View also
2008-11-24 22:41:24 -08:00
Jeremy Kemper
104f3a5776
Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used.
2008-11-24 18:43:04 -08:00
Joshua Peek
703fecb4fc
Add LAZY env flag for testing autoload/lazy load feature
2008-11-24 11:37:57 -06:00
Jeremy Kemper
6d91e7a7d6
Remove explicit tmail requires in favor of autoload
2008-11-23 13:16:39 -08:00
Joshua Peek
e201fc750b
use autoload instead of explicit requires for ActionMailer
2008-11-23 12:27:25 -06:00
Colin Curtin
1d4554d766
ActionMailer should respect content type when choosing layouts
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2008-11-21 04:09:14 +05:30
Alexey Mahotkin
84583657f4
Fixed RFC-2045 quoted-printable bug [ #1421 state:committed]
...
http://www.faqs.org/rfcs/rfc2045.html says:
may be
represented by an "=" followed by a two digit
hexadecimal representation of the octet's value. The
digits of the hexadecimal alphabet, for this purpose,
are "0123456789ABCDEF". Uppercase letters must be
used; lowercase letters are not allowed.
ActionMailer, however, used "=%02x" specification.
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-11-20 23:10:15 +01:00
David Heinemeier Hansson
51a19ae2bf
Assume that the next version is going to be 2.3 for now
2008-11-19 14:12:38 +01:00
Jeremy Kemper
eeea1a26ec
Merge branch 'master' into testing
2008-11-15 12:21:04 -08:00
David Heinemeier Hansson
e6b33a8337
Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [ #740 state:commited] (Paweł Kondzior)
2008-11-15 16:44:47 +01:00
David Heinemeier Hansson
3be853b59d
A few more dependency updates
2008-11-14 14:08:26 +01:00
David Heinemeier Hansson
61e43700b8
Prepare for RC2
2008-11-14 12:26:50 +01:00
Joel Chippindale
c65075feb6
Fixed method_missing for ActionMailer so it no longer matches methods where deliver or create are not a suffix [ #1318 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-11-11 09:46:29 -06:00
Joel Chippindale
a62e9e90d8
Fix for ActionMailer::Base.method_missing so that it raises NoMethodError when no method is found [ #1330 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-11-11 09:46:29 -06:00
Jeremy Kemper
17ac2a2482
Ruby 1.9 compat: check for minitest's assertion also
2008-11-08 22:49:28 -05:00
Grant Hollingworth
732c724df6
Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it [ #1336 state:committed]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-11-06 13:07:16 +01:00
David Heinemeier Hansson
d224e6ccb1
Update CHANGELOGs with the last few fixes, set date for today
2008-10-24 13:08:47 +02:00
David Heinemeier Hansson
5366e61458
Proper update call for gem server
2008-10-23 20:29:25 +02:00
David Heinemeier Hansson
eec6e0cbbd
Push to new gem server
2008-10-23 20:18:11 +02:00
David Heinemeier Hansson
57c31a380e
Prepare for Rails 2.2.0 [RC1]
2008-10-23 20:14:20 +02:00
madlep
2def5b6314
Fixed load path for actionmailer and activesupport tests to always load from local lib files.
...
[#983 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2008-10-04 07:57:18 -07:00
Joshua Peek
28bf2fa038
Protect body ivar from being clobbered by the mailer template assigns
2008-09-28 12:31:45 -05:00
Michael Koziarski
5f86451a4c
Bump the Version constants to align with the *next* release rather than the previous release.
...
This allows people tracking non-release gems or git submodules to use the constants.
2008-09-22 21:32:12 +02:00
U-ESCAPEE\Mack
f3f7d166d8
Fixed problem causes by leftover backup templates ending in tilde [state:committed #969 ]
...
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2008-09-09 23:29:29 -05:00
David Heinemeier Hansson
6228220c9b
Revert "Revert "Add layout functionality to mailers.""
...
This reverts commit 36c6aa01ee0a7aee5b0510a8e649c44de318b060.
2008-09-09 17:25:09 -05:00
David Heinemeier Hansson
36c6aa01ee
Revert "Add layout functionality to mailers."
...
This reverts commit e9a8e0053be3b293ab89fb584f1d660063f107aa.
2008-09-09 17:20:55 -05:00
Jeremy Kemper
a1eb4e11c2
Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, but it has since been removed from 1.9.
...
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Conflicts:
actionpack/test/controller/layout_test.rb
2008-08-31 13:20:15 -07:00
Pratik Naik
e9a8e0053b
Add layout functionality to mailers.
...
Mailer layouts behaves just like controller layouts, except layout names need to
have '_mailer' postfix for them to be automatically picked up.
2008-08-31 19:17:42 +01:00
James Mead
3cf773b187
ActionMailer should respond_to? to methods handled by method_missing [ #700 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-08-29 15:09:47 -05:00
Jeremy Kemper
172606e21f
Harmonize framework require strategy. Don't add self to load path since Rails initializer and RubyGems handle it.
2008-08-25 21:22:34 -07:00
Joshua Peek
c0dd0cee46
Removed old deprecation test because the warning was removed in 1129a24
2008-08-22 13:43:34 -05:00
Joshua Peek
04248c6208
Ensure templates are rendered if all the parts are already processed
2008-08-13 19:04:56 -05:00
Joshua Peek
b2504f8ba0
Tidy up ActionMailer rendering logic to take advantage of view path cache instead of using file system lookups
2008-08-06 20:11:21 -05:00
Joshua Peek
cb21db1a33
Treat ActionMailer template_root as a view path set internally to avoid inheritance and dupping issues
2008-07-31 20:11:52 -05:00
Jeremy Kemper
909a7f430b
Ensure mailer view path is loaded when it's assigned. Path#[] raises if it isn't loaded.
2008-07-31 17:51:43 -07:00
Tarmo Tänav
656f0e7c6c
Fix file permissions
...
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2008-07-31 16:36:23 -05:00
Joshua Peek
55bfe6be52
Ensure ActionView::PathSet::Path is not initialized with a precompiled path
2008-07-19 15:27:55 -05:00
Joshua Peek
e23156e87b
Only create a path for ActionMailer template root instead of a path set. Better fix than 7461227
2008-07-19 12:35:42 -05:00
Joshua Peek
7461227352
Ruby 1.9: Call join on template_root instead of to_s
2008-07-19 12:23:08 -05:00
Joshua Peek
b74b97fef5
Update uses_mocha in ActionMailer and ActiveResource
2008-07-19 11:14:12 -05:00
Pratik Naik
0432d15164
Merge with docrails.
2008-07-16 13:01:23 +01:00
Joshua Peek
73b34e9f75
Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class.
2008-07-12 14:33:46 -05:00
Joshua Peek
7d5c447d9c
Stubba is included in Mocha already
2008-07-11 11:12:53 -05:00
Jeremy Kemper
a02d672cd7
Horo rdoc template
2008-06-22 10:38:25 -07:00
Jeremy Kemper
231c2c5709
Update Rakefiles to connect to wrath as current user. Use ssh config to set a different user.
2008-06-18 19:58:26 -07:00
Joshua Peek
bec4b69a3b
Replaced TemplateFinder abstraction with ViewLoadPaths
2008-06-17 21:21:07 -05:00
Pratik Naik
1dbfe9766e
Ensure render :file works inside templates
2008-06-05 23:33:10 +01:00
David Heinemeier Hansson
f9db7695fe
Making ready for release of 2.1
2008-05-31 17:03:03 -07:00