Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-01 | 1 | -5/+5 | |
|\ | ||||||
| * | 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. | |||||
* | | rails/master is now 4.1.0.beta | Rafael Mendonça França | 2013-04-29 | 1 | -1/+1 | |
| | | ||||||
* | | Bump version to rc1 | David Heinemeier Hansson | 2013-04-29 | 1 | -1/+1 | |
|/ | ||||||
* | Add version method to top level modules | Charlie Somerville | 2013-03-21 | 1 | -6/+7 | |
| | ||||||
* | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 1 | -1/+1 | |
| | ||||||
* | 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 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | # 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 | |||||
* | 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 | |
|/ | ||||||
* | Updated copyright notices for 2013 | Andrew Nesbitt | 2012-12-31 | 1 | -1/+1 | |
| | ||||||
* | Inherit from MiniTest::Unit::TestCase instead of MiniTest::Spec | Rafael Mendonça França | 2012-12-31 | 1 | -7/+0 | |
| | ||||||
* | Move background jobs to the 'jobs' branch until fully baked. Not shipping ↵ | Jeremy Kemper | 2012-12-21 | 4 | -49/+2 | |
| | | | | with Rails 4.0. | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-15 | 1 | -1/+1 | |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb | |||||
| * | use default_options= instead of default to avoid confusion | Francesco Rodriguez | 2012-12-09 | 1 | -1/+1 | |
| | | ||||||
* | | Remove not used variable warnings from AM and AC | Carlos Antonio da Silva | 2012-12-11 | 1 | -2/+1 | |
| | | ||||||
* | | Merge pull request #8450 from senny/8448_mailer_return_values | Rafael Mendonça França | 2012-12-10 | 1 | -1/+4 | |
|\ \ | |/ |/| | the return value of mailer methods should not be relevant | |||||
| * | The return value from mailer methods is not relevant. | Yves Senn | 2012-12-10 | 1 | -1/+4 | |
| | | ||||||
* | | use _action callbacks in actionmailer | Francesco Rodriguez | 2012-12-08 | 1 | -4/+4 | |
| | | ||||||
* | | Cleans and removes useless 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -2/+0 | |
|/ | ||||||
* | Tiny refactor | Santiago Pastorino | 2012-11-29 | 1 | -4/+1 | |
| | ||||||
* | Explicit multipart messages respect :parts_order | Nate Berkopec | 2012-11-19 | 1 | -8/+6 | |
| | | | | | | | | | As issue #7978, the order in which ActionMailer sends multipart messages could be unintentionally overwritten if a block is passed to the mail method. This changes the mail method such that :parts_order is always respected, regardless of whether a block is passed to mail. | |||||
* | make ActionMailer::QueuedMessage autoloadable | Yves Senn | 2012-11-18 | 1 | -0/+1 | |
| | ||||||
* | Actionmailer to 1.9 hash syntax | AvnerCohen | 2012-11-08 | 1 | -9/+9 | |
| | ||||||
* | Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵ | Jon Leighton | 2012-10-30 | 1 | -3/+0 | |
| | | | | | | | | | | | | `Mailer.foo(*args).deliver`." This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8. Conflicts: actionmailer/CHANGELOG.md See discussion at https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489 | |||||
* | Do not render views when mail() isn't called. (NullMail refactoring) | Yves Senn | 2012-10-28 | 1 | -1/+13 | |
| | ||||||
* | Remove old asset_path from rails config | Joshua Peek | 2012-10-15 | 1 | -1/+0 | |
| | ||||||
* | Update test locations | Mike Moore | 2012-10-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional) | |||||
* | Update actionmailer with new hash syntax. | Kirill Nikitin | 2012-10-07 | 4 | -55/+55 | |
| | ||||||
* | Merge pull request #7708 from bdurand/optimize_log_subscribers | Rafael Mendonça França | 2012-10-01 | 1 | -2/+4 | |
|\ | | | | | Optimize log subscribers to check if the log level is sufficient | |||||
| * | Optimize log subscribers to check if the log level is sufficient before ↵ | Brian Durand | 2012-09-30 | 1 | -2/+4 | |
| | | | | | | | | performing an operations. | |||||
* | | Support `Mailer.deliver_foo(*args)` as a synonym for ↵ | Jon Leighton | 2012-09-28 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | `Mailer.foo(*args).deliver`. This makes it easy to write e.g. `Mailer.expects(:deliver_foo)` when testing code that calls the mailer. | |||||
* | | Also includes ConstantLookup dependency for controller and mailer tests | Andy Lindeman | 2012-09-26 | 1 | -0/+1 | |
| | | ||||||
* | | Support mailer tests using spec DSL | Mike Moore | 2012-09-24 | 1 | -3/+5 | |
| | | | | | | | | | | Improve how mailer tests to resolve mailers from the test name. Add tests for mailer tests using the minitest spec DSL. | |||||
* | | Register mailer tests for minitest's spec DSL | Mike Moore | 2012-09-24 | 1 | -0/+7 | |
| | | ||||||
* | | Revert "update ActionMailer::Base documentation [ci skip]" | Rafael Mendonça França | 2012-09-21 | 1 | -258/+216 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f. Conflicts: actionmailer/lib/action_mailer/base.rb Reason: @frodsan asked me to revert since this change is breaking the documentation in the edge API site | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-21 | 6 | -238/+275 | |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes. | |||||
| * | remove nodoc [ci skip] | Vijay Dev | 2012-09-21 | 1 | -1/+1 | |
| | | ||||||
| * | fix Hash#slice code example [ci skip] | Francesco Rodriguez | 2012-09-18 | 1 | -1/+1 | |
| | | ||||||
| * | update ActionMailer documentation [ci skip] | Francesco Rodriguez | 2012-09-17 | 5 | -18/+15 | |
| | | ||||||
| * | update ActionMailer::Base documentation [ci skip] | Francesco Rodriguez | 2012-09-17 | 1 | -266/+323 | |
| | | ||||||
* | | spurious space I saw in passing | Xavier Noria | 2012-09-18 | 1 | -1/+1 | |
| | | ||||||
* | | Use synchronous queue by default. Separate queued message delivery jobs from ↵ | Jeremy Kemper | 2012-09-16 | 2 | -10/+22 | |
| | | | | | | | | the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage). | |||||
* | | Updating the documentation to ActionMailer::Base.queue | Rafael Mendonça França | 2012-09-12 | 1 | -0/+3 | |
| | | ||||||
* | | Allow users to configure the queue for the mailers | Rafael Mendonça França | 2012-09-12 | 2 | -5/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This allow the users to do: config.action_mailer.queue = MyQueue.new and class UsersMailer < ActionMailer::Base self.queue = MyQueue.new end | |||||
* | | Action Mailer async flag is true by default using a Synchronous impl | Santiago Pastorino | 2012-09-11 | 3 | -57/+39 | |
|/ | ||||||
* | Allow delivery method options to be set per mail instance | Aditya Sanghi | 2012-09-04 | 2 | -3/+3 | |
| |