Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Pass through AM documentation re: 02d048d [ci skip] | Zachary Scott | 2014-05-26 | 2 | -5/+7 |
| | |||||
* | Use "Action Mailer" as canonical name in documentation [ci skip] | Zachary Scott | 2014-05-26 | 1 | -1/+1 |
| | | | | | See also: https://github.com/rails/rails/commit/3a297f8db75b172882bb3c2f9440d0c7365b8b11#commitcomment-6451708 | ||||
* | Add description of ActionMailer::TestHelper module [ci skip] | Zachary Scott | 2014-05-26 | 1 | -0/+2 |
| | |||||
* | [ci skip] Improve formatting and yml | Gaurav Sharma | 2014-04-24 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-07 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: guides/source/4_1_release_notes.md | ||||
| * | :scissors: | Zachary Scott | 2014-02-23 | 1 | -1/+1 |
| | | | | | | | | This commit also addresses rails/docrails#169 and rails/rails#14159 | ||||
* | | Introduce `Rails.gem_version` | Prem Sichanugrist | 2014-03-05 | 2 | -7/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method return `Gem::Version.new(Rails.version)`, suggesting a more reliable way to perform version comparison. Example: Rails.version #=> "4.1.2" Rails.gem_version #=> #<Gem::Version "4.1.2"> Rails.version > "4.1.10" #=> false Rails.gem_version > Gem::Version.new("4.1.10") #=> true Gem::Requirement.new("~> 4.1.2") =~ Rails.gem_version #=> true This was originally introduced as `.version` by @charliesome in #8501 but got reverted in #10002 since it was not backward compatible. Also, updating template for `rake update_versions`. | ||||
* | | update version to 4.2.0.alpha | Yves Senn | 2014-02-23 | 1 | -1/+1 |
|/ | |||||
* | Fix render plain docs example in AM::Base | Guillermo Iguaran | 2014-02-18 | 1 | -2/+2 |
| | | | The errors were introduced in e220a34e39 | ||||
* | Update Docs in favor to use render plain instead of text option | robertomiranda | 2014-02-18 | 1 | -3/+3 |
| | | | | ref #14062 | ||||
* | Merge branch '4-1-0-beta2' | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md | ||||
| * | Preparing for 4.1.0.beta2 release | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
| | | |||||
* | | Fix typo [ci skip] | Rafael Mendonça França | 2014-02-16 | 1 | -1/+1 |
| | | |||||
* | | add actionmailer test coverage for undefined delivery method | Dmitry Polushkin | 2014-02-09 | 1 | -1/+1 |
| | | |||||
* | | Remove an extra comment [ci skip] | Robin Dupret | 2014-01-26 | 1 | -1/+0 |
| | | |||||
* | | Support underscored symbols in Action Mailer config | Andrew White | 2014-01-26 | 1 | -5/+18 |
| | | | | | | | | | | | | We allow the use of underscored symbols to represent classes throughout other parts of Rails so it seems incongruous that it's not supported in `register_interceptor` and `register_observer`. | ||||
* | | Don't use a class_attribute for ActionMailer::Base.preview_path | Andrew White | 2014-01-26 | 2 | -7/+3 |
| | | | | | | | | | | Since preview_path is read from ActionMailer::Base when previewing, subclasses can’t change it so don’t there's no need for the extra overhead imposed by using it. | ||||
* | | Add the ability to intercept emails before previewing | Andrew White | 2014-01-26 | 2 | -2/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support the ability for tools like CSS style inliners to operate on emails being previewed this commit adds a hook in a similar fashion to the existing delivery interceptor hook, e.g: class CSSInlineStyler def self.previewing_email(message) # inline CSS styles end end ActionMailer::Base.register_preview_interceptor CSSInlineStyler Fixes #13622. | ||||
* | | docs should say `email` not `Email`. [ci skip] | Yves Senn | 2014-01-20 | 1 | -1/+1 |
| | | |||||
* | | removed extra comma [ci skip] | Kuldeep Aggarwal | 2014-01-14 | 1 | -1/+1 |
| | | |||||
* | | Add preview_path to autoload_paths in after_initialize | Andrew White | 2014-01-04 | 2 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | Only config.autoload_paths is frozen, so add the preview_path to ActiveSupport::Dependencies.autoload_paths directly in an after_initialize block. Also protect against a blank preview_path being added to autoload_paths which can cause a serious slowdown as Dir[] tries to load all *_preview.rb files under / Fixes #13372 | ||||
* | | update copyright notices to 2014. [ci skip] | Vipul A M | 2014-01-01 | 1 | -1/+1 |
| | | |||||
* | | Improve font of some code in API documentation [ci skip] | Chun-wei Kuo | 2013-12-26 | 1 | -17/+18 |
| | | | | | | | | | | * Add "<tt>" or "+" to improve font of some code and filenames in API documentation * Does not contain wording changes | ||||
* | | document how to access mail previews. [ci skip] | Yves Senn | 2013-12-18 | 1 | -0/+3 |
|/ | | | | /cc @pixeltrix | ||||
* | Get ready to release 4.1.0.beta1 | David Heinemeier Hansson | 2013-12-17 | 1 | -1/+1 |
| | |||||
* | Add mailer previews feature based on mail_view gem | Andrew White | 2013-12-17 | 4 | -0/+97 |
| | |||||
* | Include AV::Layouts directly in AM::Base | Łukasz Strzałkowski | 2013-12-05 | 1 | -0/+2 |
| | | | | No need to do this in railtie as AM depends on AV either way | ||||
* | `mail()` without arguments is a getter for the current mail. | Yves Senn | 2013-12-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | This behavior is documented in our guides (http://edgeguides.rubyonrails.org/action_mailer_basics.html#action-mailer-callbacks) but was broken in the past. This commit short curcuits the `mail` method if: 1. mail() was previously called 2. no headers are passed 3. no block is passed Closes #13090. /cc @pixeltrix | ||||
* | Ruby's new Hash syntax applied in actionmailer | Mr A | 2013-11-14 | 1 | -2/+2 |
| | |||||
* | calculate the ivars to remove in advance as a set and cache them in a | Aaron Patterson | 2013-11-06 | 1 | -1/+5 |
| | | | | | | | constant. `view_assigns` can use the precalculated sets and remove instance variables without allocating any extra arrays | ||||
* | Merge pull request #12591 from vipulnsward/remove_mail_merge | Yves Senn | 2013-10-20 | 1 | -3/+3 |
|\ | | | | | Remove extra variable creation and merge. | ||||
| * | Remove extra variable creation and merge. | Vipul A M | 2013-10-20 | 1 | -3/+3 |
| | | |||||
* | | Instrument the generation of Action Mailer messages | Daniel Schierbeck | 2013-10-20 | 2 | -4/+18 |
|/ | | | | | | The processing of outbound mail is instrumented with the key `process.action_mailer`. The payload includes the mailer name as well as the mailer method. | ||||
* | Don't mutate the Base settings by merge!ing the given value | Akira Matsuda | 2013-09-10 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | Remove hard require to ActionView from ActionMailer | Łukasz Strzałkowski | 2013-08-25 | 2 | -2/+0 |
| | |||||
* | Require log_subscriber | Łukasz Strzałkowski | 2013-08-25 | 1 | -0/+2 |
| | |||||
* | Load AV::Layout to AM::Base in railties | Łukasz Strzałkowski | 2013-08-25 | 1 | -2/+0 |
| | |||||
* | 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 | 1 | -2/+5 |
| | |||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-08-17 | 1 | -1/+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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake. | ||||
* | | map => map! for stopping extra array creation | Rajarshi Das | 2013-08-02 | 1 | -1/+1 |
|/ | |||||
* | Don't mutate the Base settings by merge!ing the given value | Akira Matsuda | 2013-07-26 | 1 | -1/+1 |
| | |||||
* | don't convert mailer default values to procs | Alex Tsukernik | 2013-07-22 | 1 | -1/+1 |
| | | | | | | 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 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] |