github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
10,316 Commits 34 Branches 105 Tags
b4ef958de6b16294094de28d00ba25fe2f48accc
Commit Graph

235 Commits

Author SHA1 Message Date
Carl Lerche
db3de78a83 Bump up the version to 3.0.pre 2009-06-30 14:37:12 -07:00
Yehuda Katz + Carl Lerche
19c3495a67 rm -r controller/base! 2009-06-15 16:29:45 -07:00
Yehuda Katz + Carl Lerche
5314abed18 Keep ActionMailer using the old layouts code until it gets refactored. 2009-06-15 11:59:28 -07:00
Yehuda Katz + Carl Lerche
a63caa4c0c Get tests to run (with failures) without old base around 2009-06-15 11:44:45 -07:00
Yehuda Katz + Carl Lerche
4fc0778123 Simplify helper use of ActiveSupport::Dependencies, and use super better for in #helpers 2009-06-10 12:15:30 -07:00
Friedrich Göpel
1d57ccbc6f 1.9 compatibility - don't pass an array as the from address as this ends up generating invalid SMTP commands. 2009-06-09 20:22:20 +12:00
Jeremy Kemper
a838ba392e Prefer sibling action_controller 2009-06-05 18:27:27 -07:00
Jeremy Kemper
e8550ee032 Cherry-pick core extensions 2009-05-13 12:00:15 -07:00
Yehuda Katz + Carl Lerche
ab83db9d06 Fixes ActionMailer to work with the ActionView refactoring 2009-04-27 12:34:25 -07:00
Yehuda Katz + Carl Lerche
0a132c2fe1 Refactor ActionView::Path 
* Decouple from ActionController and ActionMailer
  * Bring back localization support.
  * Prepare to decouple templates from the filesystem.
  * Prepare to decouple localization from ActionView
  * Fix ActionMailer to take advantage of ActionView::Path
 2009-04-22 17:24:41 -07:00
Carl Lerche & Yehuda Katz
b49027e188 Make more Template methods public to make ActionMailer tests pass 2009-04-16 11:57:27 -07:00
Carl Lerche & Yehuda Katz
3c1187699a Makes rails-dev-boost work again 2009-04-14 18:32:31 -07:00
Carl Lerche & Yehuda Katz
906aebceed Bring abstract_controller up to date with rails/master 
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb995
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46
      3942cb406e
      f8ea9f85d4
      e3b166aab3
      ae9f258e03
      44423126c6

0cb020b4d6
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a83
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b16246
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.
 2009-04-13 15:18:45 -07:00
David Heinemeier Hansson
73fc42cc0b Prepare for final 2.3 release 2009-03-15 22:06:50 -05:00
Sean Dague
1dff106888 Allow custom type for multipart emails [#1691 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-03-10 16:38:37 +00:00
Jeremy Kemper
1c36172c13 Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. 
[#1617 state:resolved]
 2009-03-08 13:11:58 -07:00
Elliott Wood
c41ed929bb Removed the "charset" parameter from the Content-Type header of multipart sections of nested multipart messages. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#2109 state:committed]
 2009-03-02 18:51:30 +13:00
David Heinemeier Hansson
77b0994c78 Prep for RC2 later today 2009-02-27 14:46:23 +01:00
Marcus Mateus
5c684f518f Just require tmail instead of autoloading it to fix issues when using the gem 
version [#1851 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-24 10:47:50 -06:00
Sven Fuchs
441e4e2235 load plugin view_paths to action_mailer view_paths and make action_mailer use them [#2031 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2009-02-22 10:39:56 -06:00
Matt Jones
250dfb18af Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP [#1842 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2009-02-05 20:53:02 +01:00
Yehuda Katz
eb9af20b7c Begin unifying the interface between ActionController and ActionView 2009-01-22 16:18:10 -06:00
Pratik Naik
085991891e Bump up the year in MIT license files 2009-01-18 05:28:21 +00:00
Jose' Valim
c2e7851fb2 Add ActionMailer::Base#enable_starttls_auto option for enabling/disabling STARTTLS. [#1731 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2009-01-18 04:19:18 +00:00
Joshua Peek
858a420ce1 Ensure the template format is always passed to the template finder. Now we can cleanup some nasty stuff. 2008-12-21 17:24:16 -06:00
Pratik Naik
c3f53f412c Merge docrails 2008-12-19 14:27:43 +00:00
Joshua Peek
1e1056f643 Removed deprecated register_template_extension 2008-12-02 20:26:32 -06:00
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
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
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
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
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 36c6aa01ee.
 2008-09-09 17:25:09 -05:00
David Heinemeier Hansson
36c6aa01ee Revert "Add layout functionality to mailers." 
This reverts commit e9a8e0053b.
 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