Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't mutate the Base settings by merge!ing the given value | Akira Matsuda | 2013-09-10 | 2 | -1/+4 |
| | |||||
* | Revert "Port all remaining self.protected_instance_variables to class methods" | Łukasz Strzałkowski | 2013-09-02 | 1 | -4/+2 |
| | | | | This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01. | ||||
* | Port all remaining self.protected_instance_variables to class methods | Łukasz Strzałkowski | 2013-08-29 | 1 | -2/+4 |
| | |||||
* | Make AV dependency for ActionMailer | Łukasz Strzałkowski | 2013-08-26 | 1 | -1/+1 |
| | |||||
* | Remove hard require to ActionView from ActionMailer | Łukasz Strzałkowski | 2013-08-25 | 3 | -2/+1 |
| | |||||
* | Require log_subscriber | Łukasz Strzałkowski | 2013-08-25 | 1 | -0/+2 |
| | |||||
* | Remove dependency on AV | Łukasz Strzałkowski | 2013-08-25 | 1 | -1/+1 |
| | |||||
* | Load AV::Layout to AM::Base in railties | Łukasz Strzałkowski | 2013-08-25 | 3 | -2/+7 |
| | |||||
* | Do not silance mail gem warnings. | Łukasz Strzałkowski | 2013-08-25 | 1 | -5/+1 |
| | | | | I doesn't have any at the moment | ||||
* | Include AbsC::Rendering interface in ActionMailer | Łukasz Strzałkowski | 2013-08-25 | 1 | -0/+3 |
| | |||||
* | Do not include AV::Rendering | Łukasz Strzałkowski | 2013-08-25 | 1 | -1/+0 |
| | | | | It's already included in Layouts, makes no sense to doubly include it | ||||
* | Integrate ActionMailer with ActionView | Łukasz Strzałkowski | 2013-08-25 | 2 | -2/+6 |
| | |||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-17 | 2 | -4/+1 |
|\ | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md | ||||
| * | Revert "Merge branch 'master' of github.com:rails/docrails" | Vijay Dev | 2013-08-17 | 2 | -4/+1 |
| | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake. | ||||
* | | Merge pull request #11722 from arunagw/removed-deprecation-silenced-from-test | Rafael Mendonça França | 2013-08-02 | 1 | -2/+0 |
|\ \ | | | | | | | As we are doing debug mode on | ||||
| * | | As we are doing debug mode on | Arun Agrawal | 2013-08-02 | 1 | -2/+0 |
| | | | | | | | | | | | | we don't need to silenced it | ||||
* | | | map => map! for stopping extra array creation | Rajarshi Das | 2013-08-02 | 1 | -1/+1 |
|/ / | |||||
* / | grab executable from rubygems | Arun Agrawal | 2013-07-26 | 1 | -2/+1 |
|/ | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc | ||||
* | Don't mutate the Base settings by merge!ing the given value | Akira Matsuda | 2013-07-26 | 2 | -1/+4 |
| | |||||
* | don't convert mailer default values to procs | Alex Tsukernik | 2013-07-22 | 4 | -3/+12 |
| | | | | | | 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 | ||||
* | Merge pull request #11046 from arunagw/verbose_mode_on | Carlos Antonio da Silva | 2013-06-25 | 1 | -1/+1 |
|\ | | | | | Verbose mode on when running tests | ||||
| * | Adding verbose in isolated test. | Arun Agrawal | 2013-06-21 | 1 | -1/+1 |
| | | |||||
* | | Saying gemcutter => rubygems [ci skip] | Arun Agrawal | 2013-06-21 | 1 | -1/+1 |
|/ | |||||
* | No need to load 'rake/packagetask' as it's already | Arun Agrawal | 2013-06-02 | 1 | -1/+0 |
| | | | | | in 'rubygems/package_task' | ||||
* | No need CHANGELOG entry for a test fix | Rafael Mendonça França | 2013-05-20 | 1 | -4/+1 |
| | | | | [ci skip] | ||||
* | Merge pull request #10646 from kennyj/fix_am_20130517 | Rafael Mendonça França | 2013-05-20 | 2 | -2/+5 |
|\ | | | | | Fix ActionMailer testcase break with mail 2.5.4. | ||||
| * | Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong. | kennyj | 2013-05-17 | 2 | -2/+5 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-19 | 4 | -4/+22 |
|\ \ | |/ |/| | |||||
| * | Revert "ActionMailer::Collector should be nodoc'd" | Vijay Dev | 2013-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f. Reason: Let's not nodoc without reason. [ci skip] | ||||
| * | Revert "nodoc ActionMailer module from lib/action_mailer/*.rb" | Vijay Dev | 2013-05-19 | 9 | -9/+9 |
| | | | | | | | | | | | | | | | | This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa. Reason: Let's not nodoc without reason. [ci skip] | ||||
| * | Revert "Document Rails::Generators::MailerGenerator" | Vijay Dev | 2013-05-19 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364. Reason: Let's not nodoc without reason. [ci skip] | ||||
| * | Fix documentation for ActionMailer template names. | Megan Bowra-Dean | 2013-05-17 | 1 | -4/+4 |
| | | | | | | | | 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. | ||||
| * | Document Rails::Generators::MailerGenerator | Zachary Scott | 2013-05-15 | 1 | -2/+4 |
| | | |||||
| * | nodoc ActionMailer module from lib/action_mailer/*.rb | Zachary Scott | 2013-05-15 | 9 | -9/+9 |
| | | |||||
| * | Document ActionMailer::MailHelper | Zachary Scott | 2013-05-15 | 1 | -0/+3 |
| | | |||||
| * | Document ActionMailer::LogSubscriber and ↵ | Zachary Scott | 2013-05-15 | 2 | -0/+6 |
| | | | | | | | | ActionMailer::DeliveryMethods::ClassMethods | ||||
| * | ActionMailer::Collector should be nodoc'd | Zachary Scott | 2013-05-15 | 1 | -1/+1 |
| | | |||||
| * | Document ActionMailer::Base#set_content_type | Zachary Scott | 2013-05-12 | 1 | -0/+9 |
| | | |||||
* | | Update mail to minimum version 2.5.4 | Mikel Lindsaar | 2013-05-14 | 1 | -1/+1 |
| | | |||||
* | | Extract variable out of loop | Vipul A M | 2013-05-13 | 1 | -1/+2 |
|/ | |||||
* | RDoc style for ActionMailer::Base#mail | Zachary Scott | 2013-05-10 | 1 | -23/+25 |
| | |||||
* | Document ActionMailer::Base::default, ::mailer_name, and #mailer_name | Zachary Scott | 2013-05-10 | 1 | -14/+25 |
| | |||||
* | Fix grammar on AM.mailer_name documentation. | Hendy Tanata | 2013-05-06 | 1 | -1/+1 |
| | |||||
* | Add some documentation for AM.mailer_name | Prem Sichanugrist | 2013-05-03 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 2 | -10/+9 |
|\ | |||||
| * | Remove superfluous `self.` in Action Mailer mail method documetation | Alexey Vakhov | 2013-04-23 | 1 | -3/+3 |
| | | | | | | | | | | | | 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. | ||||
| * | Cosmetic fixes in AM::Base docs. Missed spaces in OpenSSL constants ↵ | Alexey Vakhov | 2013-04-23 | 1 | -2/+2 |
| | | | | | | | | | | | | enumerations. Injected at a1639ad. | ||||
| * | Make AM readme example more consistent | Alexey Vakhov | 2013-04-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | 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. | ||||
| * | took out unnecessary wordage, changed "number" to "amount" | Waynn Lue | 2013-04-15 | 1 | -2/+1 |
| | | |||||
* | | rails/master is now 4.1.0.beta | Rafael Mendonça França | 2013-04-29 | 2 | -62/+3 |
| | |