Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Bump version to rc1 | David Heinemeier Hansson | 2013-04-29 | 1 | -1/+1 |
|/ | |||||
* | copy-edit pass in AM changelog [ci skip] | Xavier Noria | 2013-04-09 | 1 | -9/+11 |
| | |||||
* | Merge pull request #10004 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-30 | 2 | -10/+0 |
|\ | | | | | Refactored to remove unnecessary setup | ||||
| * | Refactored to remove unnecessary setup | Anupam Choudhury | 2013-03-30 | 2 | -10/+0 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 1 | -2/+2 |
|\ \ | |/ |/| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip] | ||||
| * | "overwritten" is one word | Waynn Lue | 2013-03-18 | 1 | -1/+1 |
| | | |||||
| * | update README since email-service isn't a word | Waynn Lue | 2013-03-11 | 1 | -1/+1 |
| | | |||||
* | | Add version method to top level modules | Charlie Somerville | 2013-03-21 | 1 | -6/+7 |
| | | |||||
* | | drop an unused hash; change slang to SPECIAL | Vipul A M | 2013-03-19 | 1 | -1/+1 |
| | | |||||
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" | Xavier Noria | 2013-03-18 | 1 | -1/+1 |
| | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. | ||||
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779] | Xavier Noria | 2013-03-18 | 1 | -1/+1 |
| | | |||||
* | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]. | Yves Senn | 2013-03-09 | 1 | -2/+2 |
|/ | |||||
* | Update CHANGELOGS | Rafael Mendonça França | 2013-02-26 | 1 | -0/+3 |
| | |||||
* | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 2 | -2/+2 |
| | |||||
* | Send paths argument as an array rather than converting it internally | Carlos Antonio da Silva | 2013-01-28 | 1 | -3/+3 |
| | |||||
* | Allow passing interpolations to `#default_i18n_subject`, e.g.: | Olek Janiszewski | 2013-01-24 | 4 | -3/+31 |
| | | | | | | | | | | | | | | | # 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 | ||||
* | Use Rails 4 find_by in README [ci skip] | Trung Lê | 2013-01-15 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8568 from inossidabile/fix-in_clause_length | Jon Leighton | 2013-01-11 | 1 | -0/+5 |
|\ | | | | | Correct source for in_clause_length for eager loading (Fix for #8474) | ||||
| * | Eager loading made to use relation's in_clause_length instead of host's one ↵ | Boris Staal | 2012-12-20 | 1 | -0/+5 |
| | | | | | | | | (fixes #8474) | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-01-09 | 1 | -6/+6 |
|\ \ | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md | ||||
| * | | deliver_ is an old API | Akira Matsuda | 2013-01-04 | 1 | -6/+6 |
| | | | |||||
* | | | Update mailer generator USAGE | Akira Matsuda | 2013-01-06 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | * it does not generate fixtures * it generates .text.erb templates | ||||
* | | | Fix missing spaces before and after equal signs in method definitions | Robin Dupret | 2013-01-03 | 2 | -3/+3 |
|/ / |