diff options
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionmailer/Rakefile | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 45283d11a9..bec81dfa1d 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.] + * Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml). #2398 [Dave Burt <dave@burt.id.au>, Jeremy Kemper] diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index d8cbc20a96..51ec9ed6b9 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version') PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_NAME = 'actionmailer' -PKG_VERSION = ActionMailer::Version::STRING + PKG_BUILD +PKG_VERSION = ActionMailer::VERSION::STRING + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" RELEASE_NAME = "REL #{PKG_VERSION}" diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 49e55ccf97..97e97feb60 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,5 +1,5 @@ module ActionMailer - module Version #:nodoc: + module VERSION #:nodoc: MAJOR = 1 MINOR = 1 TINY = 3 |