aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Improve formatting and ymlGaurav Sharma2014-04-241-2/+2
|
* Fix MailerPreview broken testsArthur Neves2014-03-151-4/+4
| | | | | | | | | | | `BaseMailerPreview.welcome` is an instance method, so we need to stub the method on a instance level and not on Class. The stub is important to make sure the Message object is the same in the other expectations. This was working randomly because Mocha uses == to compare two objects on the `with()` expectation and even if the Mail::Message objects were not the same object they are equal, but thats not the case in 100% of the runs. So we need to make sure we use `.any_instance` method and have the right message object.
* Make sure we clean preview_interceptorsArthur Neves2014-03-071-0/+1
| | | | We should make sure we clean preview_interceptors after each test so they dont leaky to the next test
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-03-072-2/+2
|\ | | | | | | | | Conflicts: guides/source/4_1_release_notes.md
| * :scissors:Zachary Scott2014-02-232-2/+2
| | | | | | | | This commit also addresses rails/docrails#169 and rails/rails#14159
* | Introduce `Rails.gem_version`Prem Sichanugrist2014-03-052-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 branchCarlos Antonio da Silva2014-02-251-61/+1
| | | | | | | | Remove 4-1 related entries from master [ci skip]
* | update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
|/
* Fix render plain docs example in AM::BaseGuillermo Iguaran2014-02-181-2/+2
| | | The errors were introduced in e220a34e39
* Update Docs in favor to use render plain instead of text optionrobertomiranda2014-02-181-3/+3
| | | | ref #14062
* Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-181-1/+1
|\ | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
| * Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-181-1/+1
| |
* | Fix typo [ci skip]Rafael Mendonça França2014-02-161-1/+1
| |
* | Merge pull request #13997 from dmitry/test_coverage_improvementRafael Mendonça França2014-02-092-10/+21
|\ \ | | | | | | Test coverage improvement
| * | add actionmailer test coverage for undefined delivery methodDmitry Polushkin2014-02-092-10/+21
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-02-091-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 agreementWaynn Lue2014-01-131-1/+1
| | |
* | | tidy CHANGELOGs [ci skip]Yves Senn2014-01-301-4/+6
| | |
* | | Remove an extra comment [ci skip]Robin Dupret2014-01-261-1/+0
| | |
* | | Support underscored symbols in Action Mailer configAndrew White2014-01-263-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_pathAndrew White2014-01-262-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 previewingAndrew White2014-01-264-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 Senn2014-01-201-1/+1
| | |
* | | removed extra comma [ci skip]Kuldeep Aggarwal2014-01-141-1/+1
| | |
* | | standardize on jruby_skip & rbx_skipGaurish Sharma2014-01-131-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 Senn2014-01-061-0/+2
| | |
* | | Add preview_path to autoload_paths in after_initializeAndrew White2014-01-042-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 M2014-01-012-2/+2
|/ /
* | Improve font of some code in API documentation [ci skip]Chun-wei Kuo2013-12-261-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 Senn2013-12-181-0/+3
|/ | | | /cc @pixeltrix
* Get ready to release 4.1.0.beta1David Heinemeier Hansson2013-12-171-1/+1
|
* Disable available locales checks to avoid warnings running the testsCarlos Antonio da Silva2013-12-171-0/+3
|
* Add mailer previews feature based on mail_view gemAndrew White2013-12-175-0/+101
|
* Include AV::Layouts directly in AM::BaseŁukasz Strzałkowski2013-12-051-0/+2
| | | | No need to do this in railtie as AM depends on AV either way
* Retain ActionPack dependency on ActionViewŁukasz Strzałkowski2013-12-051-3/+0
|
* `mail()` without arguments is a getter for the current mail.Yves Senn2013-12-023-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 Noria2013-11-241-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 Sabne2013-11-081-1/+1
| | | | | | Highlighted code
* | Improve changelogsCarlos Antonio da Silva2013-11-221-7/+9
| | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | Ruby's new Hash syntax applied in actionmailerMr A2013-11-144-5/+5
|/
* calculate the ivars to remove in advance as a set and cache them in aAaron Patterson2013-11-061-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_mergeYves Senn2013-10-201-3/+3
|\ | | | | Remove extra variable creation and merge.
| * Remove extra variable creation and merge.Vipul A M2013-10-201-3/+3
| |
* | Instrument the generation of Action Mailer messagesDaniel Schierbeck2013-10-204-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 RailsWaynn Lue2013-09-121-3/+1
|
* Remove unused raw email fixturesclaudiob2013-09-1215-736/+0
| | | | The tests that used the raw_email_* fixtures were removed in d500ad3
* Merge pull request #12184 from waynn/patch-4Steve Klabnik2013-09-101-1/+1
|\ | | | | "previous version of Rails" is gramatically incorrect
| * [ci skip] 'previous version of Rails' is gramatically incorrectWaynn Lue2013-09-101-1/+1
| |
* | Don't mutate the Base settings by merge!ing the given valueAkira Matsuda2013-09-102-1/+4
|/
* Revert "Port all remaining self.protected_instance_variables to class methods"Łukasz Strzałkowski2013-09-021-4/+2
| | | | This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:20:55 +0000