| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | Convert changelogs to 1.9 hash style and fix some formatting [ci skip] | Carlos Antonio da Silva | 2012-12-14 | 1 | -2/+2 |
| | | | |||||
| * | | 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 | 4 | -2/+16 |
| |\ \ | | | | | | | the return value of mailer methods should not be relevant | ||||
| | * | | The return value from mailer methods is not relevant. | Yves Senn | 2012-12-10 | 4 | -2/+16 |
| | | | | |||||
| * | | | Revert "Omit directories from gemspec.files for RubyGems 2 compat." | Jeremy Kemper | 2012-12-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25. | ||||
| * | | | Omit directories from gemspec.files for RubyGems 2 compat. | Jeremy Kemper | 2012-12-08 | 1 | -1/+1 |
| | |/ |/| | | | | | | | | | RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted. | ||||
| * | | use _action callbacks in actionmailer | Francesco Rodriguez | 2012-12-08 | 4 | -14/+14 |
| | | | |||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-04 | 1 | -2/+0 |
| |\ \ | |/ |/| | | | | | Conflicts: guides/source/migrations.md | ||||
| | * | Cleans and removes useless 'Examples' tag [ci skip] | Alvaro Pereyra | 2012-12-01 | 1 | -2/+0 |
| | | | |||||
| * | | Bump mailer to quiet the stdout log messages | Jeremy Kemper | 2012-12-03 | 1 | -1/+1 |
| |/ | |||||
| * | Tiny refactor | Santiago Pastorino | 2012-11-29 | 1 | -4/+1 |
| | | |||||
| * | Explicit multipart messages respect :parts_order | Nate Berkopec | 2012-11-19 | 3 | -29/+30 |
| | | | | | | | | | | 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 |
| | | |||||
| * | Upgrade mail dependency to 2.5.2 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 |
| | | |||||
| * | Upgrade mail dependency to 2.5.0 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 1 | -9/+9 |
| |\ | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | ||||
| | * | Actionmailer to 1.9 hash syntax | AvnerCohen | 2012-11-08 | 1 | -9/+9 |
| | | | |||||
| * | | Clean up gemspecs | Vinny Diehl | 2012-11-08 | 1 | -7/+10 |
| |/ | | | | | | | | | | Organized the gemspec files a bit. * Made quotes more consistent (single quotes dominated, so I used that). * Moved license line down a line, separating it logically, and removed the extra whitespace before its = operator. * Minor whitespace fixes. | ||||
| * | Revert "Support `Mailer.deliver_foo(*args)` as a synonym for ↵ | Jon Leighton | 2012-10-30 | 3 | -15/+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 | 5 | -1/+28 |
| | | |||||
| * | Remove old asset_path from rails config | Joshua Peek | 2012-10-15 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 1 | -8/+8 |
| |\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb | ||||
| | * | Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev) | Robin Dupret | 2012-10-10 | 1 | -8/+8 |
| | | | |||||
| | * | Revert "Add changelog/release note entries for missing ActionMailer super ↵ | Aditya Sanghi | 2012-10-10 | 1 | -3/+0 |
| | | | | | | | | | | | | | feature related to inclusion of callbacks in mailers" This reverts commit f16ec8c864ba12c2315713af76b11be5887cfa3a. | ||||
| | * | Add changelog/release note entries for missing ActionMailer super feature ↵ | Aditya Sanghi | 2012-10-10 | 1 | -0/+3 |
| | | | | | | | | | related to inclusion of callbacks in mailers | ||||
| * | | Add missing CHANGELOG related to addition of callbacks to mailers. | Aditya Sanghi | 2012-10-10 | 1 | -0/+4 |
| | | | |||||
| * | | 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 | 15 | -169/+169 |
| | | | |||||
| * | | 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 | 3 | -0/+15 |
| | | | | | | | | | | | | | | | `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 | 2 | -3/+149 |
| | | | | | | | | | | | 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 | 2 | -0/+44 |
| | | | |||||
| * | | 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 | 5 | -27/+30 |
| | | | | | | | | | the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage). | ||||
| * | | Move queue classes to ActiveSupport | Santiago Pastorino | 2012-09-14 | 2 | -4/+4 |
| | | | |||||
| * | | 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 | 3 | -13/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -61/+51 |
| |/ | |||||
| * | fix bad changelog example | Aditya Sanghi | 2012-09-07 | 1 | -1/+1 |
| | | |||||
| * | Allow delivery method options to be set per mail instance | Aditya Sanghi | 2012-09-04 | 4 | -3/+58 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionmailer