| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | :scissors: | Zachary Scott | 2014-02-23 | 2 | -2/+2 | |
| | | | | | | | | | | | | | 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`. | |||||
| * | | | Point master changelogs to 4-1-stable branch | Carlos Antonio da Silva | 2014-02-25 | 1 | -61/+1 | |
| | | | | | | | | | | | | | Remove 4-1 related entries from master [ci skip] | |||||
| * | | | 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 | |
| | | | | ||||||
| * | | | Merge pull request #13997 from dmitry/test_coverage_improvement | Rafael Mendonça França | 2014-02-09 | 2 | -10/+21 | |
| |\ \ \ | | | | | | | | | Test coverage improvement | |||||
| | * | | | add actionmailer test coverage for undefined delivery method | Dmitry Polushkin | 2014-02-09 | 2 | -10/+21 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-02-09 | 1 | -1/+1 | |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md | |||||
| | * | | | e-mail => email, and subject/verb agreement | Waynn Lue | 2014-01-13 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | tidy CHANGELOGs [ci skip] | Yves Senn | 2014-01-30 | 1 | -4/+6 | |
| | | | | | ||||||
| * | | | | 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 | 3 | -5/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -5/+109 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
| * | | | standardize on jruby_skip & rbx_skip | Gaurish Sharma | 2014-01-13 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use these helpers instead of calls directly to RUBY_ENGINE/RbConfig/JRUBY_VERSION | |||||
| * | | | quick formatting pass through CHANGELOGS. [ci skip]. | Yves Senn | 2014-01-06 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | 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 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | 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 | |
| | | ||||||
| * | Disable available locales checks to avoid warnings running the tests | Carlos Antonio da Silva | 2013-12-17 | 1 | -0/+3 | |
| | | ||||||
| * | Add mailer previews feature based on mail_view gem | Andrew White | 2013-12-17 | 5 | -0/+101 | |
| | | ||||||
| * | 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 | |||||
| * | Retain ActionPack dependency on ActionView | Łukasz Strzałkowski | 2013-12-05 | 1 | -3/+0 | |
| | | ||||||
| * | `mail()` without arguments is a getter for the current mail. | Yves Senn | 2013-12-02 | 3 | -0/+42 | |
| | | | | | | | | | | | | | | | 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 | |||||
| * | Merge remote-tracking branch 'docrails/master' | Xavier Noria | 2013-11-24 | 1 | -1/+1 | |
| |\ | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/deep_merge.rb activesupport/lib/active_support/core_ext/hash/keys.rb | |||||
| | * | Update README.rdoc [ci skip] | Harshad Sabne | 2013-11-08 | 1 | -1/+1 | |
| | | | | | | | Highlighted code | |||||
| * | | Improve changelogs | Carlos Antonio da Silva | 2013-11-22 | 1 | -7/+9 | |
| | | | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip] | |||||
| * | | Ruby's new Hash syntax applied in actionmailer | Mr A | 2013-11-14 | 4 | -5/+5 | |
| |/ | ||||||
| * | 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 | 4 | -7/+29 | |
| |/ | | | | | | 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. | |||||
| * | take out reference to previous versions of Rails | Waynn Lue | 2013-09-12 | 1 | -3/+1 | |
| | | ||||||
| * | Remove unused raw email fixtures | claudiob | 2013-09-12 | 15 | -736/+0 | |
| | | | | | The tests that used the raw_email_* fixtures were removed in d500ad3 | |||||
| * | Merge pull request #12184 from waynn/patch-4 | Steve Klabnik | 2013-09-10 | 1 | -1/+1 | |
| |\ | | | | | "previous version of Rails" is gramatically incorrect | |||||
| | * | [ci skip] 'previous version of Rails' is gramatically incorrect | Waynn Lue | 2013-09-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | 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 | |
| | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionmailer