From a58e6608378c18f2722c1901b5c6480b03444bce Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Sat, 9 Mar 2013 19:04:57 +0100 Subject: Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]. --- actionmailer/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 8f74ac0928..487e57be7b 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -21,7 +21,7 @@ *Olek Janiszewski* * Eager loading made to use relation's `in_clause_length` instead of host's one. - Fix #8474 + Fixes #8474. *Boris Staal* @@ -29,7 +29,7 @@ *Nate Berkopec* * Do not render views when mail() isn't called. - Fix #7761 + Fixes #7761. *Yves Senn* -- cgit v1.2.3 From c24528fbc94dea9946a563be3bed9559583bdc57 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Mon, 18 Mar 2013 20:35:49 +0100 Subject: instruct RDoc to only parse Ruby files under lib [Fixes #9779] --- actionmailer/actionmailer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 67ec0d1097..4e553b59e7 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*'] + s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*.rb'] s.require_path = 'lib' s.requirements << 'none' -- cgit v1.2.3 From ddd2c75b2668d4a22681c0c39221bbdfb516cd06 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Mon, 18 Mar 2013 21:18:36 +0100 Subject: Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. --- actionmailer/actionmailer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 4e553b59e7..67ec0d1097 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.email = 'david@loudthinking.com' s.homepage = 'http://www.rubyonrails.org' - s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*.rb'] + s.files = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*'] s.require_path = 'lib' s.requirements << 'none' -- cgit v1.2.3 From 6893c23f48d2707714240a1ae2a410a0661aa3a5 Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Tue, 19 Mar 2013 10:53:32 +0530 Subject: drop an unused hash; change slang to SPECIAL --- actionmailer/test/mailers/base_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index 504ca36483..20b6671283 100644 --- a/actionmailer/test/mailers/base_mailer.rb +++ b/actionmailer/test/mailers/base_mailer.rb @@ -119,7 +119,7 @@ class BaseMailer < ActionMailer::Base def without_mail_call end - def with_nil_as_return_value(hash = {}) + def with_nil_as_return_value mail(:template_name => "welcome") nil end -- cgit v1.2.3 From c07e1515f7c66f5599cbb3c7e9fe42e166bf3edc Mon Sep 17 00:00:00 2001 From: Charlie Somerville Date: Wed, 20 Mar 2013 20:42:05 +1100 Subject: Add version method to top level modules --- actionmailer/lib/action_mailer/version.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 997046b971..89e31c4be6 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,10 +1,11 @@ module ActionMailer - module VERSION #:nodoc: - MAJOR = 4 - MINOR = 0 - TINY = 0 - PRE = "beta1" + # Returns the version of the currently loaded ActionMailer as a Gem::Version + def self.version + Gem::Version.new "4.0.0.beta1" + end - STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') + module VERSION #:nodoc: + MAJOR, MINOR, TINY, PRE = ActionMailer.version.segments + STRING = ActionMailer.version.to_s end end -- cgit v1.2.3