TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
23,509 Commits 2 Branches 0 Tags 294 MiB
4f433bcd8d
Commit Graph

837 Commits

Author SHA1 Message Date
Santiago Pastorino
fcb230144b Bump up nokogiri, memcache-client, sqlite3-ruby, fcgi, mail and tzinfo 2010-07-15 13:18:47 -07:00
Benjamin Quorning
7e075e6247 Fixed many references to the old config/environment.rb and Rails::Initializer 2010-07-13 13:00:21 +02:00
Santiago Pastorino
8a09ea6d6d Avoids deprecation warning running tests 2010-07-04 13:52:48 -07:00
Wincent Colaiuta
75b32a69a1 Fixes for "router" and "routes" terminology 
Commit f7ba614c2db improved the internal consistency of the different
means of accessing routes, but it introduced some problems at the level
of code comments and user-visible strings.

This commit applies fixes on three levels:

Firstly, we remove or replace grammatically invalid constructs such as
"a routes" or "a particular routes".

Secondly, we make sure that we always use "the router DSL" or "the
router syntax", because this has always been the official terminology.

Finally, we make sure that we only use "routes" when referring to the
application-specific set of routes that are defined in the
"config/routes.rb" file, we use "router" when referring on a more
abstract level to "the code in Rails used to handle routing", and we use
"routing" when we need an adjective to apply to nouns such as
"url_helpers. Again this is consistent with historical practice and
other places in the documentation.

Note that this is not a sweep over the entire codebase to ensure
consistent usage of language; it is just a revision of the changes
introduced in commit f7ba614c2db.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-03 22:42:31 +02:00
Santiago Pastorino
cb321546b7 Time has it own implementation of xmlschema, now AMo doesn't depend on TZInfo 
[#4979 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-02 01:51:03 +02:00
Piotr Sarnacki
f7ba614c2d Unify routes naming by renaming router to routes 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-07-02 01:51:03 +02:00
Wincent Colaiuta
52c56f9f7e docs: note that mail() accepts arbitrary headers 
The documentation makes it sound like mail() only accepts a limited
set of headers in the headers hash, but it in fact accepts any
arbitrary headers, and there is a test ("can pass random headers in
as a hash to mail") for it in the test suite.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
 2010-06-30 17:07:19 +02:00
José Valim
6788db824a Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved] 2010-06-24 13:23:43 +02:00
Santiago Pastorino
ef7a04ea85 Fixes encoding mistakes on old_base/mail_service tests 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-23 09:26:49 +02:00
Xavier Noria
207fa59675 Merge remote branch 'rails/master' 
Conflicts:
	actionpack/lib/abstract_controller/base.rb
 2010-06-20 23:13:19 +02:00
Xavier Noria
2aa4e5f3fa pdoc tasks publishe APIs in api.rubyonrails.org 2010-06-16 22:39:13 +02:00
Xavier Noria
01f3f0dbae use RDoc 2.2 to generate the documentation of individual components 2010-06-16 22:30:06 +02:00
Rizwan Reza
de65c82bfa Changes call backs to callbacks. 2010-06-15 22:48:10 +04:30
Evgeniy Dolzhenko
ef404c771d Fix a bunch of minor spelling mistakes 2010-06-15 12:04:22 +04:00
Xavier Noria
f17159b029 edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord" 2010-06-14 23:22:04 +02:00
David Chelimsky
c125116013 docfix (email instead of emai) 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-13 22:10:45 +02:00
José Valim
a12079df9f Tidy up generators based on latest change on AM. 2010-06-13 13:56:08 +02:00
David Chelimsky
d588bbd431 Move ActionMailer::TC to AV::TC::Behavior 
[#4843 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-12 15:34:31 +02:00
José Valim
30eaecb3df subject is automatically looked up on I18n using mailer_name and action_name as scope as in t('.subject') 2010-06-12 15:33:12 +02:00
Evgeniy Dolzhenko
ccf9577aee Fix a bunch of minor spelling mistakes 2010-06-11 14:15:34 +04:00
David Heinemeier Hansson
32d4330b81 Get ready for beta 4 2010-06-08 14:47:02 -04:00
Mikel Lindsaar
3762362eab Updating readme for ActionMailer::Base 2010-06-07 23:14:54 -04:00
Mikel Lindsaar
311d99eef0 Adding inline attachment support to ActionMailer 2010-06-07 21:54:53 -04:00
Mikel Lindsaar
735027e58d Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit) 2010-06-07 15:30:08 -04:00
David Heinemeier Hansson
08baa343c8 Extract assets paths and make them available to Action Mailer as well 2010-06-03 23:32:12 +10:00
Santiago Pastorino
52f905715e Unforce text-format from AM 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-06-03 23:32:11 +10:00
Jeremy Kemper
69a9669d9d Missing changelog heading 2010-05-23 09:46:31 -07:00
Neeraj Singh
b462952886 Use better assertion methods for testing 
[#4645 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-19 10:18:36 +02:00
Neeraj Singh
d00afeaeed Use assert_equal correctly in actionmailer test (exposing one as broken) 
[#4626 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-18 16:12:59 +02:00
Santiago Pastorino
fa5f93698d Added missing require, we are using bind method defined on active_support/core_ext/proc 
[#4610 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-16 16:16:15 +02:00
wycats
458f5712dc Remove the need for a special action_mailer.url_for initializer that loads before anything else 2010-05-15 06:09:07 -07:00
Mikel Lindsaar
4a8a62058a Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-14 09:27:47 +02:00
Mikel Lindsaar
058f7feafe Cleaning up Action Mailer spelling with and without the space 2010-05-04 19:24:40 +02:00
Mikel Lindsaar
fb30feb48b Adding more docs to ActionMailer 2010-05-04 19:24:40 +02:00
Justin George
731d4392e4 Change event namespace ordering to most-significant first [#4504 state:resolved] 
More work still needs to be done on some of these names
(render_template.action_view and render_template!.action_view particularly)
but this allows (for example) /^sql/ to subscribe to all
the various ORMs without further modification

Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-02 22:45:54 +02:00
Mikel Lindsaar
ceaa100e59 Adding ability for the procs to be called within the instance, allows you to pass results from instance methods to the mail header 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-02 11:56:08 +02:00
Mikel Lindsaar
08b07b60b6 Adding ability to pass proc's to the ActionMailer class default method 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-05-02 11:56:08 +02:00
José Valim
cde168edbb Update generators to use thor 0.13.6 with simpler source_root handling. 2010-04-30 12:42:12 +02:00
José Valim
7b98d2aa59 Reorganize the mailer generator a bit. 2010-04-30 12:11:38 +02:00
Carlhuda
c54c84b7b4 Move ActionMailer generator to AM 2010-04-29 16:45:57 -07:00
Nathan Weizenbaum
ef5dadaf93 Only run load hooks once a file has been fully loaded. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-04-27 21:37:40 -07:00
Santiago Pastorino
76d6a99364 Use explicit source encoding rather than forced UTF-8 from US-ASCII. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-04-26 14:45:23 -07:00
Santiago Pastorino
66b55dbfea Add missing require 2010-04-16 18:44:54 -03:00
José Valim
b4fd5e6f1a template_name and template_path should not be added to mail headers. 2010-04-13 23:04:22 +02:00
David Heinemeier Hansson
4c8af9bf51 Update changelogs for release 2010-04-13 12:14:54 -07:00
José Valim
3fc609ee41 Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2 2010-04-12 10:50:27 +02:00
José Valim
b5f9a9fce3 Move set_fields! to the old API module. 2010-04-12 10:25:02 +02:00
Mikel Lindsaar
dd02090d76 Updating changelog for Mail 2.2.0 2010-04-11 18:06:30 +10:00
Mikel Lindsaar
fc5d817145 Updating actionmailer to Mail version 2.2.0 2010-04-11 18:04:57 +10:00
Mikel Lindsaar
2a793fa2a8 New mail is more intelligent on encoding and decoding 2010-04-11 18:04:57 +10:00
Mikel Lindsaar
bd89c391e8 Cleaning up expectations from the new way mail does it 2010-04-11 18:04:56 +10:00
Mikel Lindsaar
fd9ee49f38 Moved test of QP into mail 2010-04-11 18:04:56 +10:00
Mikel Lindsaar
a9e918f40e Don't need no quoting test, done in mail 2010-04-11 18:04:56 +10:00
Mikel Lindsaar
03dd8f7917 Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8 2010-04-11 18:04:55 +10:00
Mikel Lindsaar
e157a3d222 Added explict setting of charset in set_fields! method to make sure Mail has the user defined default 2010-04-11 18:04:55 +10:00
Mikel Lindsaar
6c6bef245a Fixing up some bad test cases 2010-04-11 18:04:55 +10:00
Mikel Lindsaar
dbcf01e631 Removing quoting.rb, upgrade to 2.1.3.6, changing all utf-8 references to UTF-8, updating tests where incorrect encoding 2010-04-11 18:04:55 +10:00
Mikel Lindsaar
8f22be04dc Removing quoting and adding Mail 2.3.5 2010-04-11 18:04:54 +10:00
José Valim
ee309d506c Update versions (otherwise you install a gem from source as beta3 but internally it's beta2) and update CHANGELOG. 2010-04-10 12:17:34 +02:00
David Heinemeier Hansson
f0364d87f0 Release is today, yo 2010-04-01 14:20:03 -07:00
wycats
c1883e75b3 Updated changelogs to differentiate beta1 and beta2 2010-04-01 14:04:55 -07:00
wycats
d2a48852a1 Updated changelogs 2010-04-01 13:55:06 -07:00
David Heinemeier Hansson
d868cb4f8a Prep for beta2, depend on latest Bundler 2010-04-01 13:36:45 -07:00
wycats
4aded43b73 Replace the placeholder base_hook API with on_load. To specify some code that 
should run during framework load do:

ActiveSupport.on_load(:action_controller) do
  # Code run in the context of AC::Base
end
 2010-03-29 17:08:50 -07:00
Jeremy Kemper
0d6f97e702 Bump mail to 2.1.5.3 2010-03-29 08:05:39 -07:00
Jeremy Kemper
5c058295d1 Bump mail dep to 2.1.5.1 2010-03-28 11:44:46 -07:00
Jeremy Kemper
154f9ce5fd Merge remote branch 'mikel/master' 2010-03-28 11:34:30 -07:00
Xavier Noria
76f024ac8d adds missing requires for Object#blank? and Object#present? 2010-03-28 14:15:02 +02:00
Mikel Lindsaar
53bcd4af09 Updating mail version requirement to 2.1.5 2010-03-28 17:03:49 +11:00
Mikel Lindsaar
4e0d1cfad7 Fixing up attachment encoding specs to work with latest mail - and be correct 2010-03-28 17:03:33 +11:00
Mikel Lindsaar
b91c57d16c Mail now correctly bundles up the charset into the content type field 2010-03-28 16:24:54 +11:00
Mikel Lindsaar
a41d1b1fb1 Updating test, should be calling :decoded, not :encoded, is a problem now that Mail is fixed 2010-03-28 16:22:37 +11:00
Mikel Lindsaar
63002ba36b Fixing test, ; is a delimiter, not a termination character, ref RFC 2045 2010-03-28 15:24:35 +11:00
José Valim
a09e99259c Ensure details are frozen after @details_keys lookup. The implementation waits to freeze until the last required moment, to avoid duping hashes. 2010-03-27 20:52:11 +01:00
José Valim
395d6648ce Move application configuration to the application configuration object, remove railtie_name and engine_name and allow to set the configuration object. 2010-03-26 18:47:55 +01:00
Evan Phoenix
1e4be20672 Fix ActionMailer test issues 
* Don't depend so much no the message in a NameError
* Reset the delivery method properly
 2010-03-22 10:00:03 -07:00
José Valim
f28d856cec Improve performance of the rendering stack by freezing formats as a sign that they shouldn't be further modified. 2010-03-19 17:20:20 +01:00
Carlhuda
9da153c2d3 Fix an error in isolated running of tests 2010-03-18 11:31:52 -07:00
Jeremy Kemper
41af6d9a78 Use Array.wrap not Array() 2010-03-17 22:27:48 -07:00
Jeremy Kemper
fe2f383cf3 Fix broken test due to constant collision 2010-03-17 22:27:34 -07:00
Jeremy Kemper
db9e67a6c8 Kill nonexistent method removal 2010-03-17 21:43:01 -07:00
wycats
a5587efc19 Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM warnings are in dependencies. 2010-03-17 00:20:09 -07:00
wycats
cd9ffd11e1 Eliminate warnings for AM on 1.8 2010-03-16 23:24:00 -07:00
José Valim
f2c0a353ae Finish cleaning up rendering stack from views and move assigns evaluation to controller (so plugins and/or controllers can overwrite just one method). 2010-03-12 20:39:53 +01:00
José Valim
2a12686832 Allow anything that responds to render to be given as :template and use find_template instead of find in views. 2010-03-12 14:25:10 +01:00
José Valim
00d6271d2b Clean up the API required from ActionView::Template. 2010-03-09 13:12:11 +01:00
José Valim
7942e90960 Merge master. 2010-03-08 21:06:26 +01:00
José Valim
36eb1a686c Bring AM up to date with new rendering stack. 2010-03-08 20:57:33 +01:00
José Valim
ffd8d753f1 Move layout lookup to views. 2010-03-08 02:04:18 +01:00
José Valim
c7564d74e8 Added template lookup responsible to hold all information used in template lookup. 2010-03-07 19:41:58 +01:00
wycats
39d6f9e112 Make many parts of Rails lazy. In order to facilitate this, 
add lazy_load_hooks.rb, which allows us to declare code that
should be run at some later time. For instance, this allows
us to defer requiring ActiveRecord::Base at boot time purely
to apply configuration. Instead, we register a hook that should
apply configuration once ActiveRecord::Base is loaded.

With these changes, brings down total boot time of a
new app to 300ms in production and 400ms in dev.

TODO: rename base_hook
 2010-03-07 06:24:30 -08:00
Stefan Penner
4bc2cbc3cf Load RAILS_VERSION relative to the gemspec file. 2010-03-06 21:33:28 -08:00
Bryan Helmkamp
deb00bcb8c Read Rails version from a file instead of modifying the load path and doing requires 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-03-04 21:25:52 -08:00
Carlhuda
46bf2f04a8 Fixed a broken AM test. I'm unsure how this passed before. 2010-03-04 17:44:16 -08:00
Carl Lerche
05b9382e29 Update the ActionMailer tests to run off of the latest ActionController config refactor 2010-03-04 01:12:16 -08:00
Carl Lerche
ad2e6ee4ec Fix a bunch of failing AP / AM specs created from the previous AbstractController configuration refactor. 2010-03-04 01:01:21 -08:00
Pavel Golubeff
cd5ec4744d Fix quoting regexp encoding in ActionMailer 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-03-03 10:12:42 +01:00
Carl Lerche
05f27761a2 Fix action_mailer tests 2010-03-02 22:55:09 -08:00
Carlhuda
aa749a74f6 Get the railties tests to pass again. 2010-03-02 14:00:25 -08:00
Carlhuda
b01db07a9f Moved initializers for ActionMailer and ActionController into their own railties 2010-03-02 12:32:31 -08:00
Jeremy Kemper
56ea20605a Wordsmith gem descriptions 2010-03-02 10:43:41 -08:00
Bryan Helmkamp
f221a6f19f Leverage VERSION constants from gemspecs to avoid tedious updates when releasing 2010-03-02 00:32:53 -05:00
Bryan Helmkamp
a4111bbca0 Update versions of all components to normalize them to new format 2010-03-02 00:32:48 -05:00
Bryan Helmkamp
11db694e0b Remove cruft in the gem packaging and release code 2010-03-01 19:00:19 -08:00
Joshua Peek
f0fe555d84 fix up actionmailer load path 2010-02-28 18:18:21 -06:00
Carlhuda
98f77e0827 Rename named_url_helpers to url_helpers and url_helpers to url_for 2010-02-26 15:04:50 -08:00
Carlhuda
9a5be2e5a8 Get Railties tests passing 2010-02-25 17:53:01 -08:00
Carlhuda
1fb2c6f635 Get ActionMailer's tests passing with the non global router 2010-02-25 17:53:01 -08:00
José Valim
df85ab41c1 Renamed LocalizedCache to DetailsCache. 2010-02-24 22:17:26 +01:00
José Valim
9d7d6cd7ba Use render instead render_to_body. 2010-02-24 22:17:25 +01:00
Carlhuda
24ab5665b2 Revert "Fix test load paths for those not using bundler" 
This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818.

This commit broke tests. You cannot have a file called "bundler" on the load path.
 2010-02-23 17:31:17 -08:00
Mikel Lindsaar
cefc136ec3 Adding options to register observers and interceptors through ActionMailer::Base.register_observer and ActionMailer::Base.register_interceptor. These hook into Mail.register_interceptor and Mail.register_observer. Also bumped Mail requirement to 2.1.3 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-02-22 09:15:48 +01:00
Martin Schürrer
6bc24d40d5 Use ActionDispatch::Routing everywhere 2010-02-21 13:43:51 -08:00
José Valim
be35a1510d Allow to choose the template path and template name used in implicit rendering with ActionMailer. 2010-02-19 10:51:17 +01:00
José Valim
3f948a0e29 Merge master. 2010-02-17 00:48:04 +01:00
Prem Sichanugrist
f0523f72b4 Rename Rails::Subscriber to Rails::LogSubscriber 2010-02-16 22:36:15 +01:00
Joshua Peek
eec2d301d4 Fix test load paths for those not using bundler 2010-02-15 10:20:11 -06:00
Mikel Lindsaar
5fe3dc4bf5 Adding ruby version spec to all gemspec files to at least 1.8.7 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-02-08 09:42:12 +01:00
Mikel Lindsaar
bb55bbd207 Fixing actionmailer tests for CI 2010-02-06 23:36:03 -08:00
RomD
f44a0b1d52 fix usage examples and more to use new invocations 
Signed-off-by: Carl Lerche <carllerche@mac.com>
 2010-02-06 09:51:53 -08:00
Prem Sichanugrist
1d9d9d2d89 Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [#3879 status:resolved] 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-02-06 15:51:44 +01:00
Jeremy Kemper
c548e21365 Bump git versions to 3.0.0.beta1 since we've released 2010-02-05 09:24:12 -08:00
Paul Rosania
363a752c36 install ActionController::UrlFor before environment is parsed, to provide ActionMailer#default_url_options= 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2010-02-05 00:08:56 -08:00
Jeremy Kemper
459ecaf95d Submarine the rake-gemcutter dep in Rakefiles 2010-02-05 00:03:03 -08:00
Jeremy Kemper
7b81f5981f Fix task defines 2010-02-04 18:44:32 -08:00
Jeremy Kemper
c1785f3282 Release using gemcutter gem:push tasks 2010-02-04 18:28:45 -08:00
Jeremy Kemper
23ad1eff0d Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always uses AS. 2010-02-04 10:08:06 -08:00
Santiago Pastorino and José Ignacio Costa
6d6e6105c0 require 'action_controller' added on a test that uses it 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-02-04 14:07:24 +01:00
David Heinemeier Hansson
031139bb71 Homogenize gemspecs and remove the deprecated autorequire 2010-02-03 17:59:49 -08:00
David Heinemeier Hansson
79817aa9e7 Move to 3.0.0.beta 2010-02-03 17:29:51 -08:00
Mikel Lindsaar
d1eed079e1 Merge branch 'master' of git://github.com/rails/rails 2010-02-02 10:51:19 +11:00
José Valim
d74b5e440c Make AM test suite green. 2010-02-01 23:34:47 +01:00
Jeremy Kemper
e5ab4b0d07 Convert to class_attribute 2010-02-01 02:02:42 -08:00
Carl Lerche
9f01dff9c2 Get rails tests running on bundler 0.9 2010-01-31 19:13:43 -08:00
Mikel Lindsaar
65ad16568c Updating copyright dates on all licenses 2010-02-01 10:10:53 +11:00
Mikel Lindsaar
bb2c7b432c Updating Action Mailer documentation 2010-01-31 09:46:51 -08:00
José Valim
2d567e470a Add transfer_encoding= setter deprecation. 2010-01-30 16:39:27 +01:00
José Valim
0e063f435c Fix some backward incompatible behavior on AM. 2010-01-30 16:35:22 +01:00
José Valim
17ea8d8d4d Automatically configure generators if application is defined. 2010-01-29 17:51:06 +01:00
José Valim
3f84091937 ActionMailer should depend just on AbstractController. 2010-01-29 17:51:05 +01:00
Mikel Lindsaar
2960077445 Add a failing test case for render :layout 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-01-29 17:51:05 +01:00
Mikel Lindsaar
1024c11f3c Added tests for rendering different template for new API 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2010-01-29 17:51:05 +01:00
Jeremy Kemper
452bb1e48d Rename 'defaults' class method to 'default' to reflect that it's a declaration 2010-01-27 19:38:17 -08:00
Jeremy Kemper
187b3b0b48 Fix time comparison. Mail#date returns DateTime not Time. 2010-01-27 19:08:36 -08:00
Jeremy Kemper
8c60acbea2 Expected attachment encoding is binary 2010-01-27 18:37:17 -08:00
Jeremy Kemper
030ab357f9 Remove unbundle changelogs 2010-01-27 17:11:29 -08:00
Mikel Lindsaar
a06a5a64ba Unvendor'd text-format, now requires text-format gem 2010-01-28 12:08:14 +11:00
Mikel Lindsaar
32ce2bb37f Updated mail requirement to 2.1.2 2010-01-28 11:33:58 +11:00
Mikel Lindsaar
b6b3db6734 Fixed bug on HTML only emails getting set to text/plain 2010-01-28 00:24:30 +11:00
José Valim
9f63c4b26e Bring AM tests back to green again. 2010-01-26 19:50:59 +01:00
José Valim
af43674c1c Fix failing tests on AM about render(:body => Hash). 2010-01-26 19:15:32 +01:00
José Valim
bdc39fad36 Merge branch 'master' of git://github.com/rails/rails 2010-01-26 18:39:53 +01:00
Joshua Peek
31b538df64 Failing AM test for legacy multipart alternative rendering 2010-01-26 09:37:20 -06:00
Joshua Peek
9f7190187c Failing AM test for nested layouts 2010-01-26 09:27:54 -06:00
José Valim
48a3985dd7 Also include translation in ActionMailer. 2010-01-26 16:18:29 +01:00
José Valim and Mikel Lindsaar
05c4ad9d3f Tidy up tests and docs. 2010-01-26 16:00:24 +01:00
Mikel Lindsaar
ccea6ab07d Fixing up tests and docs to use defaults :from => 'name' instead of defaults({:from => 'name'}) 2010-01-27 00:38:12 +11:00
Mikel Lindsaar
1133757a95 Merge branch 'master' of github.com:mikel/rails 
Conflicts:
	actionmailer/lib/action_mailer/base.rb
 2010-01-27 00:21:22 +11:00
Mikel Lindsaar
21dcc20ed2 Fixed up documentation to reflect code change and cleaned up tests of spurious #deliver calls 2010-01-27 00:18:40 +11:00
Mikel Lindsaar
9520166f70 Fixed up being able to pass random headers in with headers, or mail. Also, undeprecated headers(hash) as this works now too 2010-01-27 00:06:19 +11:00
José Valim and Mikel Lindsaar
39a1b06f13 Deprecate old defaults API. 2010-01-26 11:46:42 +01:00
José Valim and Mikel Lindsaar
9dd65c368b Make defaults accept a hash. 2010-01-26 11:21:20 +01:00
Mikel Lindsaar
e297eed4f2 Fixing up expectations in base_test.rb 2010-01-26 17:11:36 +11:00
Mikel Lindsaar
0b05acd424 Implementing class level :defaults hash, instead of delivers_from et al 2010-01-26 17:08:55 +11:00
José Valim
abad097016 Merge remote branch 'mikel/master' 2010-01-26 01:56:52 +01:00
José Valim and Mikel Lindsaar
c02391f8f9 Fix small typo. 2010-01-26 01:54:23 +01:00
José Valim and Mikel Lindsaar
4af2bbc6b4 Merge branch 'master' of github.com:mikel/rails 2010-01-26 01:51:23 +01:00
José Valim and Mikel Lindsaar
74a5889abe Refactor content type setting, added tests to ensure boundary exists on multipart and fixed typo 2010-01-26 11:49:59 +11:00
José Valim and Mikel Lindsaar
6589976533 Remove old files, add some information to docs and improve test suite. 2010-01-26 01:43:41 +01:00
José Valim and Mikel Lindsaar
f14390091c We don't support enriched yet 2010-01-26 00:09:18 +11:00
José Valim and Mikel Lindsaar
4a6eba3232 Added initial documentation for the new API 2010-01-25 23:46:23 +11:00
José Valim and Mikel Lindsaar
ad8f5d4106 Updated to mail 2.1.1 2010-01-25 23:15:16 +11:00
José Valim and Mikel Lindsaar
d5e4e9185b Updated gemspec for Mail 2010-01-25 21:47:24 +11:00
José Valim and Mikel Lindsaar
ace74974cf Got AM working with Mail yield on delivery_handler and updated tests 2010-01-25 21:47:03 +11:00
José Valim and Mikel Lindsaar
4240369a43 changed test to get TestMailer to use :file delivery method directly (as setup action was resetting delivery_method to :test on init 2010-01-25 13:46:44 +11:00
José Valim and Mikel Lindsaar
e4a989e9d9 Added delivery_handler method to mail and implemented in ActionMailer to deliver inside of instrumentation 2010-01-25 13:39:48 +11:00
José Valim
3b6f659fb6 Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config. 2010-01-25 01:12:22 +01:00
José Valim and Mikel Lindsaar
e1c1318638 Added delivers_from. 2010-01-25 00:37:12 +01:00
José Valim and Mikel Lindsaar
48faf53be1 Add some view paths tests. 2010-01-25 00:20:38 +01:00
José Valim and Mikel Lindsaar
90e9e46576 Merge branch 'master' of github.com:mikel/rails 2010-01-24 23:59:29 +01:00
José Valim and Mikel Lindsaar
0ece244fee Ensure implicit multipart templates with locale works as expected. 2010-01-24 23:59:12 +01:00
José Valim and Mikel Lindsaar
4e96442c4e Merge branch 'master' of git://github.com/rails/rails 
Conflicts:
	actionmailer/lib/action_mailer/mail_helper.rb
	railties/lib/rails/configuration.rb
 2010-01-25 09:50:01 +11:00
José Valim and Mikel Lindsaar
a74a655648 Add tests to mail helper. 2010-01-24 19:52:50 +01:00
José Valim and Mikel Lindsaar
bd96614101 Move old tests to a specific folder and add some delivery method tests. 2010-01-24 19:36:42 +01:00
José Valim and Mikel Lindsaar
99f960a3d7 Handle some TODOs and deprecations. 2010-01-24 18:40:04 +01:00
José Valim and Mikel Lindsaar
0d931fecbb Finish cleaning up delivery methods implementation. 2010-01-24 18:11:57 +01:00
José Valim and Mikel Lindsaar
5dead5bb88 Maintain old_api and deprecated_api in different files. 2010-01-24 17:49:48 +01:00
José Valim and Mikel Lindsaar
f30d73bab4 Add new class delivery method API. 2010-01-24 17:31:18 +01:00
José Valim and Mikel Lindsaar
7409b73484 Some refactoring. 2010-01-24 16:37:28 +01:00
José Valim
6545a68264 Fix failing tests after merge. 2010-01-24 15:08:06 +01:00
José Valim
e548f96b1d Rename plugin_name to railtie_name and engine_name. 2010-01-24 12:23:21 +01:00
José Valim and Mikel Lindsaar
73a9000402 Adding failing tests for calling just the action, instead of :create_action_name and :deliver_action_name 2010-01-24 20:38:53 +11:00
José Valim and Mikel Lindsaar
afc758297c Moving AS::Notifications call to one location in base 2010-01-24 12:30:13 +11:00
José Valim and Mikel Lindsaar
258ca14800 Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback support in Mail to call ActionMailer on delivery, moved deliver to deprecated API in preparation for new API 2010-01-24 11:15:42 +11:00
José Valim and Mikel Lindsaar
e7e4ed48df Set sort order for explicit parts from the collector's template sequence 2010-01-24 09:34:50 +11:00
José Valim and Mikel Lindsaar
c985a0ee3d Add some tests to collector with templates and any. 2010-01-23 12:46:40 +01:00
José Valim and Mikel Lindsaar
6ba944608e Make implicit and explicit templates pass through the same part creation process. 2010-01-23 12:20:20 +01:00
José Valim and Mikel Lindsaar
5a19d24892 Adding collector to ActionMailer 2010-01-23 21:50:36 +11:00
José Valim and Mikel Lindsaar
c6b16260fe Added basic explicit multipart rendering and tests 2010-01-23 21:37:34 +11:00
José Valim and Mikel Lindsaar
5c3ef8c17d Refactor subject with i18n. 2010-01-23 10:24:19 +01:00