diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-30 18:58:59 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-30 18:58:59 -0700 |
| commit | f8f6ad6ebc1602afa6af3c9cb297ea7896fb8b3a (patch) | |
| tree | 606bd96e651b33f1cb580f04f9499f565115fed5 | |
| parent | 4c8805d60e85e89852da9f1df1dd6f82bc2df957 (diff) | |
| parent | 9bbdceb34d33aa31567447e43b5fb5ea638e14fa (diff) | |
| download | rails-f8f6ad6ebc1602afa6af3c9cb297ea7896fb8b3a.tar.gz rails-f8f6ad6ebc1602afa6af3c9cb297ea7896fb8b3a.tar.bz2 rails-f8f6ad6ebc1602afa6af3c9cb297ea7896fb8b3a.zip | |
Merge pull request #6562 from martinoconnor/generator-fix-stable
3-2-stable Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 4b7decee5c..52a2df350f 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -234,7 +234,7 @@ module Rails if defined?(JRUBY_VERSION) "gem 'therubyrhino'\n" else - "# gem 'therubyracer', :platform => :ruby\n" + "# gem 'therubyracer', :platforms => :ruby\n" end end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 5bf1dbda8d..90a49e8085 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -253,7 +253,7 @@ class AppGeneratorTest < Rails::Generators::TestCase if defined?(JRUBY_VERSION) assert_file "Gemfile", /gem\s+["']therubyrhino["']$/ else - assert_file "Gemfile", /# gem\s+["']therubyracer["']+, :platform => :ruby$/ + assert_file "Gemfile", /# gem\s+["']therubyracer["']+, :platforms => :ruby$/ end end |