aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-06 06:10:22 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-06 06:10:22 -0800
commit5b9c8a51a5d1343a8f71008b130ee580a3417adc (patch)
treeb375dc1affc62970d9e642fa7bde86eb35aa7b42
parentfc956425d405e75bcf310f3e6f08cf201cc8131a (diff)
parentdcb818c0adf1dfd93c82e8994633e76ecf462d84 (diff)
downloadrails-5b9c8a51a5d1343a8f71008b130ee580a3417adc.tar.gz
rails-5b9c8a51a5d1343a8f71008b130ee580a3417adc.tar.bz2
rails-5b9c8a51a5d1343a8f71008b130ee580a3417adc.zip
Merge pull request #4348 from lest/change-array-wrap
use Kernel#Array instead of Array.wrap in Rails::Generators::Actions
-rw-r--r--railties/lib/rails/generators/actions.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index ce62ea463d..7e7d54e6ed 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -1,6 +1,5 @@
require 'open-uri'
require 'rbconfig'
-require 'active_support/core_ext/array/wrap'
module Rails
module Generators
@@ -92,7 +91,7 @@ module Rails
if options[:env].nil?
inject_into_file 'config/application.rb', "\n #{data}", :after => sentinel, :verbose => false
else
- Array.wrap(options[:env]).each do |env|
+ Array(options[:env]).each do |env|
inject_into_file "config/environments/#{env}.rb", "\n #{data}", :after => env_file_sentinel, :verbose => false
end
end