Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:rails/rails

  • Loading branch information...
commit 8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 2 parents dc25138 + b4fd5e6
Yehuda Katz wycats authored
3  actionmailer/CHANGELOG
... ... @@ -1,7 +1,10 @@
  1 +*Rails 3.0.0 [beta 3] (April 13th, 2010)*
  2 +
1 3 * Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]
2 4
3 5 * Lot of updates to various test cases that now work better with the new Mail and so have different expectations
4 6
  7 +
5 8 *Rails 3.0.0 [beta 2] (April 1st, 2010)*
6 9
7 10 * Added interceptors and observers from Mail [ML]
2  actionmailer/lib/action_mailer/base.rb
@@ -541,7 +541,7 @@ def mail(headers={}, &block)
541 541 wrap_delivery_behavior!(headers.delete(:delivery_method))
542 542
543 543 # Assign all headers except parts_order, content_type and body
544   - assignable = headers.except(:parts_order, :content_type, :body)
  544 + assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
545 545 assignable.each { |k, v| m[k] = v }
546 546
547 547 # Render the templates and blocks
10 actionmailer/test/base_test.rb
@@ -510,28 +510,28 @@ def different_layout(layout_name='')
510 510
511 511 # Rendering
512 512 test "you can specify a different template for implicit render" do
513   - mail = BaseMailer.implicit_different_template('implicit_multipart')
  513 + mail = BaseMailer.implicit_different_template('implicit_multipart').deliver
514 514 assert_equal("HTML Implicit Multipart", mail.html_part.body.decoded)
515 515 assert_equal("TEXT Implicit Multipart", mail.text_part.body.decoded)
516 516 end
517 517
518 518 test "you can specify a different template for explicit render" do
519   - mail = BaseMailer.explicit_different_template('explicit_multipart_templates')
  519 + mail = BaseMailer.explicit_different_template('explicit_multipart_templates').deliver
520 520 assert_equal("HTML Explicit Multipart Templates", mail.html_part.body.decoded)
521 521 assert_equal("TEXT Explicit Multipart Templates", mail.text_part.body.decoded)
522 522 end
523 523
524 524 test "you can specify a different layout" do
525   - mail = BaseMailer.different_layout('different_layout')
  525 + mail = BaseMailer.different_layout('different_layout').deliver
526 526 assert_equal("HTML -- HTML", mail.html_part.body.decoded)
527 527 assert_equal("PLAIN -- PLAIN", mail.text_part.body.decoded)
528 528 end
529 529
530 530 test "you can specify the template path for implicit lookup" do
531   - mail = BaseMailer.welcome_from_another_path('another.path/base_mailer')
  531 + mail = BaseMailer.welcome_from_another_path('another.path/base_mailer').deliver
532 532 assert_equal("Welcome from another path", mail.body.encoded)
533 533
534   - mail = BaseMailer.welcome_from_another_path(['unknown/invalid', 'another.path/base_mailer'])
  534 + mail = BaseMailer.welcome_from_another_path(['unknown/invalid', 'another.path/base_mailer']).deliver
535 535 assert_equal("Welcome from another path", mail.body.encoded)
536 536 end
537 537
2  actionpack/CHANGELOG
... ... @@ -1,4 +1,4 @@
1   -*Rails 3.0.0 [beta 3] (pending)*
  1 +*Rails 3.0.0 [beta 3] (April 13th, 2010)*
2 2
3 3 * New option :as added to form_for allows to change the object name. The old <% form_for :client, @post %> becomes <% form_for @post, :as => :client %> [spastorino]
4 4
2  actionpack/test/controller/layout_test.rb
@@ -209,7 +209,7 @@ def test_layout_status_is_rendered
209 209 end
210 210 end
211 211
212   -unless RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/
  212 +unless RUBY_PLATFORM =~ /mswin|mingw/
213 213 class LayoutSymlinkedTest < LayoutTest
214 214 layout "symlinked/symlinked_layout"
215 215 end
5 activemodel/CHANGELOG
... ... @@ -1,3 +1,8 @@
  1 +*Rails 3.0.0 [beta 3] (April 13th, 2010)*
  2 +
  3 +* No changes
  4 +
  5 +
1 6 *Rails 3.0.0 [beta 2] (April 1st, 2010)*
2 7
3 8 * #new_record? and #destroyed? were removed from ActiveModel::Lint. Use
2  activerecord/CHANGELOG
... ... @@ -1,4 +1,4 @@
1   -*Rails 3.0.0 [Beta 2] (pending)*
  1 +*Rails 3.0.0 [beta 3] (April 13th, 2010)*
2 2
3 3 * Add Relation extensions. [Pratik Naik]
4 4
5 activeresource/CHANGELOG
... ... @@ -1,3 +1,8 @@
  1 +*Rails 3.0.0 [beta 3] (April 13th, 2010)*
  2 +
  3 +* No changes
  4 +
  5 +
1 6 *Rails 3.0.0 [beta 1] (February 4, 2010)*
2 7
3 8 * Add support for errors in JSON format. #1956 [Fabien Jakimowicz]
2  activesupport/CHANGELOG
... ... @@ -1,4 +1,4 @@
1   -*Rails 3.0.0 [beta 3] (pending)*
  1 +*Rails 3.0.0 [beta 3] (April 13th, 2010)*
2 2
3 3 * Improve transliteration quality. #4374 [Norman Clarke]
4 4
2  activesupport/lib/active_support/core_ext/proc.rb
... ... @@ -1,4 +1,4 @@
1   -require "active_support/core_ext/object"
  1 +require "active_support/core_ext/kernel/singleton_class"
2 2
3 3 class Proc #:nodoc:
4 4 def bind(object)
3  railties/CHANGELOG
... ... @@ -1,5 +1,8 @@
  1 +*Rails 3.0.0 [beta 3] (April 13th, 2010)*
  2 +
1 3 * Renamed config.cookie_secret to config.secret_token and pass it as env key. [JV]
2 4
  5 +
3 6 *Rails 3.0.0 [beta 2] (April 1st, 2010)*
4 7
5 8 * Session store configuration has changed [YK & CL]
2  railties/guides/source/initialization.textile
Source Rendered
@@ -2636,7 +2636,7 @@ The method +find_with_root_flag+ is defined on +Rails::Engine+ (the superclass o
2636 2636 root = File.exist?("#{root_path}/#{flag}") ? root_path : default
2637 2637 raise "Could not find root path for #{self}" unless root
2638 2638
2639   - RUBY_PLATFORM =~ /(:?mswin|mingw)/ ?
  2639 + RUBY_PLATFORM =~ /mswin|mingw/ ?
2640 2640 Pathname.new(root).expand_path : Pathname.new(root).realpath
2641 2641 end
2642 2642 </ruby>
2  railties/lib/rails/commands/runner.rb
@@ -18,7 +18,7 @@
18 18 opts.on("-h", "--help",
19 19 "Show this help message.") { $stderr.puts opts; exit }
20 20
21   - if RUBY_PLATFORM !~ /(:?mswin|mingw)/
  21 + if RUBY_PLATFORM !~ /mswin|mingw/
22 22 opts.separator ""
23 23 opts.separator "You can also use runner as a shebang line for your scripts like this:"
24 24 opts.separator "-------------------------------------------------------------"
2  railties/lib/rails/engine.rb
@@ -119,7 +119,7 @@ def find_root_with_flag(flag, default=nil)
119 119 root = File.exist?("#{root_path}/#{flag}") ? root_path : default
120 120 raise "Could not find root path for #{self}" unless root
121 121
122   - RUBY_PLATFORM =~ /(:?mswin|mingw)/ ?
  122 + RUBY_PLATFORM =~ /mswin|mingw/ ?
123 123 Pathname.new(root).expand_path : Pathname.new(root).realpath
124 124 end
125 125 end
17 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
... ... @@ -1,13 +1,14 @@
1 1 <%%= form_for(@<%= singular_name %>) do |f| %>
2 2 <%% if @<%= singular_name %>.errors.any? %>
3   - <div id="errorExplanation">
4   - <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
5   - <ul>
6   - <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
7   - <li><%%= msg %></li>
8   - <%% end %>
9   - </ul>
10   - </div>
  3 + <div id="error_explanation">
  4 + <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
  5 +
  6 + <ul>
  7 + <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
  8 + <li><%%= msg %></li>
  9 + <%% end %>
  10 + </ul>
  11 + </div>
11 12 <%% end %>
12 13
13 14 <% for attribute in attributes -%>
2  railties/lib/rails/generators/rails/app/app_generator.rb
@@ -265,7 +265,7 @@ def mysql_socket
265 265 "/opt/local/var/run/mysql4/mysqld.sock", # mac + darwinports + mysql4
266 266 "/opt/local/var/run/mysql5/mysqld.sock", # mac + darwinports + mysql5
267 267 "/opt/lampp/var/mysql/mysql.sock" # xampp for linux
268   - ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
  268 + ].find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /mswin|mingw/
269 269 end
270 270
271 271 def empty_directory_with_gitkeep(destination, config = {})
6 railties/lib/rails/generators/rails/stylesheets/templates/scaffold.css
@@ -34,7 +34,7 @@ div.field, div.actions {
34 34 display: table;
35 35 }
36 36
37   -#errorExplanation {
  37 +#error_explanation {
38 38 width: 450px;
39 39 border: 2px solid red;
40 40 padding: 7px;
@@ -43,7 +43,7 @@ div.field, div.actions {
43 43 background-color: #f0f0f0;
44 44 }
45 45
46   -#errorExplanation h2 {
  46 +#error_explanation h2 {
47 47 text-align: left;
48 48 font-weight: bold;
49 49 padding: 5px 5px 5px 15px;
@@ -54,7 +54,7 @@ div.field, div.actions {
54 54 color: #fff;
55 55 }
56 56
57   -#errorExplanation ul li {
  57 +#error_explanation ul li {
58 58 font-size: 12px;
59 59 list-style: square;
60 60 }
2  railties/lib/rails/test_unit/testing.rake
@@ -30,7 +30,7 @@ end
30 30 module Kernel
31 31 def silence_stderr
32 32 old_stderr = STDERR.dup
33   - STDERR.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
  33 + STDERR.reopen(RUBY_PLATFORM =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
34 34 STDERR.sync = true
35 35 yield
36 36 ensure
11 release.rb
... ... @@ -0,0 +1,11 @@
  1 +version = ARGV.pop
  2 +
  3 +%w( activesupport activemodel activerecord activeresource actionpack actionmailer railties ).each do |framework|
  4 + puts "Building and pushing #{framework}..."
  5 + `cd #{framework} && gem build #{framework}.gemspec && gem push #{framework}-#{version}.gem && rm #{framework}-#{version}.gem`
  6 +end
  7 +
  8 +puts "Building and pushing Rails..."
  9 +`gem build rails.gemspec`
  10 +`gem push rails-#{version}.gem`
  11 +`rm rails-#{version}.gem`

0 comments on commit 8e9df34

Please sign in to comment.
Something went wrong with that request. Please try again.