Skip to content

Commit f25ad07

Browse files
committedNov 28, 2014
Start Rails 5 development 🎉
We will support only Ruby >= 2.1. But right now we don't accept pull requests with syntax changes to drop support to Ruby 1.9.
1 parent ee614af commit f25ad07

File tree

20 files changed

+37
-2746
lines changed

20 files changed

+37
-2746
lines changed
 

‎.travis.yml

-6
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,12 @@ env:
1616
- "GEM=ar:postgresql"
1717
- "GEM=aj:integration"
1818
rvm:
19-
- 1.9.3
20-
- 2.0.0
2119
- 2.1
2220
- ruby-head
2321
- rbx-2
2422
- jruby
2523
matrix:
2624
allow_failures:
27-
- rvm: 1.9.3
28-
env: "GEM=ar:mysql"
29-
- rvm: 2.0.0
30-
env: "GEM=ar:mysql"
3125
- rvm: ruby-head
3226
env: "GEM=ar:mysql"
3327
- rvm: rbx-2

‎RAILS_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.0.beta4
1+
5.0.0.alpha

‎actionmailer/CHANGELOG.md

+1-63
Original file line numberDiff line numberDiff line change
@@ -1,63 +1 @@
1-
* `MailerGenerator` now generates layouts by default. The HTML mailer layout
2-
now includes `<html>` and `<body>` tags which improve the spam rating in
3-
some spam detection engines. Mailers now inherit from `ApplicationMailer`
4-
which sets the default layout.
5-
6-
*Andy Jeffries*
7-
8-
* `link_to` and `url_for` now generate URLs by default in templates.
9-
Passing `only_path: false` is no longer needed.
10-
11-
Fixes #16497 and #16589.
12-
13-
*Xavier Noria*, *Richard Schneeman*
14-
15-
* Attachments can now be added while rendering the mail template.
16-
17-
Fixes #16974.
18-
19-
*Christian Felder*
20-
21-
* Add `#deliver_later` and `#deliver_now` methods and deprecate `#deliver` in
22-
favor of `#deliver_now`. `#deliver_later` will enqueue a job to render and
23-
deliver the mail instead of delivering it immediately. The job is enqueued
24-
using the new Active Job framework in Rails and will use the queue that you
25-
have configured in Rails.
26-
27-
*DHH*, *Abdelkader Boudih*, *Cristian Bica*
28-
29-
* `ActionMailer::Previews` are now class methods instead of instance methods.
30-
31-
*Cristian Bica*
32-
33-
* Deprecate `*_path` helpers in email views. They generated broken links in
34-
email views and were not the intention of most developers. The `*_url`
35-
helper is recommended instead.
36-
37-
*Richard Schneeman*
38-
39-
* Raise an exception when attachments are added after `mail` is called.
40-
This is a safeguard to prevent invalid emails.
41-
42-
Fixes #16163.
43-
44-
*Yves Senn*
45-
46-
* Add `config.action_mailer.show_previews` configuration option.
47-
48-
This configuration option can be used to enable the mail preview in
49-
environments other than development (such as staging).
50-
51-
Defaults to `true` in development and `false` elsewhere.
52-
53-
*Leonard Garvey*
54-
55-
* Allow preview interceptors to be registered through
56-
`config.action_mailer.preview_interceptors`.
57-
58-
See #15739.
59-
60-
*Yves Senn*
61-
62-
Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/actionmailer/CHANGELOG.md)
63-
for previous changes.
1+
Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/actionmailer/CHANGELOG.md) for previous changes.

‎actionmailer/lib/action_mailer/gem_version.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ def self.gem_version
55
end
66

77
module VERSION
8-
MAJOR = 4
9-
MINOR = 2
8+
MAJOR = 5
9+
MINOR = 0
1010
TINY = 0
11-
PRE = "beta4"
11+
PRE = "alpha"
1212

1313
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1414
end

0 commit comments

Comments
 (0)
Please sign in to comment.