Commit Graph

693 Commits

Author SHA1 Message Date
Ł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
d1760253f5 Load AV::Layout to AM::Base in railties 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
Rajarshi Das
938481010a map => map! for stopping extra array creation 2013-08-02 18:04:34 +05:30
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
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
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
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
Charlie Somerville
c07e1515f7 Add version method to top level modules 2013-03-21 19:56:07 +11: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
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
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
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
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
Francesco Rodriguez
4d6a314a22 use default_options= instead of default to avoid confusion 2012-12-09 00:01:28 -05:00
Francesco Rodriguez
4ec7493e3c use _action callbacks in actionmailer 2012-12-08 10:21:20 -05:00
Alvaro Pereyra
4940d6d096 Cleans and removes useless 'Examples' tag [ci skip] 2012-12-01 15:19:45 -05:00