38 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/generators.rb b/railties/lib/generators.rb
index ed2ce43ba2..ddb65c8579 100644
--- a/railties/lib/generators.rb
+++ b/railties/lib/generators.rb
@@ -178,7 +178,7 @@ module Rails
       # Return all defined namespaces.
       #
       def self.namespaces
-        Thor::Base.subclasses.map(&:namespace)
+        Thor::Base.subclasses.map{ |klass| klass.namespace }
       end
 
       # Keep builtin generators in an Array[Array[group, name]].
diff --git a/railties/lib/vendor/thor/CHANGELOG.rdoc b/railties/lib/vendor/thor-0.11.0/CHANGELOG.rdoc
index 544dde8c02..544dde8c02 100644
--- a/railties/lib/vendor/thor/CHANGELOG.rdoc
+++ b/railties/lib/vendor/thor-0.11.0/CHANGELOG.rdoc
diff --git a/railties/lib/vendor/thor/LICENSE b/railties/lib/vendor/thor-0.11.0/LICENSE
index 98722da459..98722da459 100644
--- a/railties/lib/vendor/thor/LICENSE
+++ b/railties/lib/vendor/thor-0.11.0/LICENSE
diff --git a/railties/lib/vendor/thor/README.markdown b/railties/lib/vendor/thor-0.11.0/README.markdown
index a1d7259775..a1d7259775 100644
--- a/railties/lib/vendor/thor/README.markdown
+++ b/railties/lib/vendor/thor-0.11.0/README.markdown
diff --git a/railties/lib/vendor/thor/bin/rake2thor b/railties/lib/vendor/thor-0.11.0/bin/rake2thor
index 50c7410d80..50c7410d80 100755
--- a/railties/lib/vendor/thor/bin/rake2thor
+++ b/railties/lib/vendor/thor-0.11.0/bin/rake2thor
diff --git a/railties/lib/vendor/thor/bin/thor b/railties/lib/vendor/thor-0.11.0/bin/thor
index eaf849fb4a..eaf849fb4a 100755
--- a/railties/lib/vendor/thor/bin/thor
+++ b/railties/lib/vendor/thor-0.11.0/bin/thor
diff --git a/railties/lib/vendor/thor/lib/thor.rb b/railties/lib/vendor/thor-0.11.0/lib/thor.rb
index 72d5574983..72d5574983 100644
--- a/railties/lib/vendor/thor/lib/thor.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions.rb
index 126d8df428..126d8df428 100644
--- a/railties/lib/vendor/thor/lib/thor/actions.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/copy_file.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/copy_file.rb
index b9d2e9e0a7..b9d2e9e0a7 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/copy_file.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/copy_file.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/create_file.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/create_file.rb
index 2f3732247e..2f3732247e 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/create_file.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/create_file.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/directory.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/directory.rb
index 24ff210b0f..24ff210b0f 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/directory.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/directory.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/empty_directory.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/empty_directory.rb
index 3f29d52362..3f29d52362 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/empty_directory.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/empty_directory.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/get.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/get.rb
index a0d12b8370..a0d12b8370 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/get.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/get.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/inject_into_file.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/inject_into_file.rb
index ab6a90d317..ab6a90d317 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/inject_into_file.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/inject_into_file.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/template.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/template.rb
index 6b2e50b8c5..6b2e50b8c5 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/template.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/template.rb
diff --git a/railties/lib/vendor/thor/lib/thor/actions/templater.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/templater.rb
index 5aa2f99b16..5aa2f99b16 100644
--- a/railties/lib/vendor/thor/lib/thor/actions/templater.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/actions/templater.rb
diff --git a/railties/lib/vendor/thor/lib/thor/base.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/base.rb
index e6d364e767..e6d364e767 100644
--- a/railties/lib/vendor/thor/lib/thor/base.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/base.rb
diff --git a/railties/lib/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/core_ext/hash_with_indifferent_access.rb
index 3213961fe4..3213961fe4 100644
--- a/railties/lib/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/core_ext/hash_with_indifferent_access.rb
diff --git a/railties/lib/vendor/thor/lib/thor/core_ext/ordered_hash.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/core_ext/ordered_hash.rb
index 5e4ad5609f..5e4ad5609f 100644
--- a/railties/lib/vendor/thor/lib/thor/core_ext/ordered_hash.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/core_ext/ordered_hash.rb
diff --git a/railties/lib/vendor/thor/lib/thor/error.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/error.rb
index c846e9ce74..c846e9ce74 100644
--- a/railties/lib/vendor/thor/lib/thor/error.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/error.rb
diff --git a/railties/lib/vendor/thor/lib/thor/group.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/group.rb
index e4e1533386..e4e1533386 100644
--- a/railties/lib/vendor/thor/lib/thor/group.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/group.rb
diff --git a/railties/lib/vendor/thor/lib/thor/invocation.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/invocation.rb
index 9093b1e5df..9093b1e5df 100644
--- a/railties/lib/vendor/thor/lib/thor/invocation.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/invocation.rb
diff --git a/railties/lib/vendor/thor/lib/thor/parser.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/parser.rb
index 57a3f6e1a5..57a3f6e1a5 100644
--- a/railties/lib/vendor/thor/lib/thor/parser.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/parser.rb
diff --git a/railties/lib/vendor/thor/lib/thor/parser/argument.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/argument.rb
index 2d7f4dbafb..2d7f4dbafb 100644
--- a/railties/lib/vendor/thor/lib/thor/parser/argument.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/argument.rb
diff --git a/railties/lib/vendor/thor/lib/thor/parser/arguments.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/arguments.rb
index 9a2262d6f7..9a2262d6f7 100644
--- a/railties/lib/vendor/thor/lib/thor/parser/arguments.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/arguments.rb
diff --git a/railties/lib/vendor/thor/lib/thor/parser/option.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/option.rb
index ab9be6fb9f..ab9be6fb9f 100644
--- a/railties/lib/vendor/thor/lib/thor/parser/option.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/option.rb
diff --git a/railties/lib/vendor/thor/lib/thor/parser/options.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/options.rb
index 29f6500d97..29f6500d97 100644
--- a/railties/lib/vendor/thor/lib/thor/parser/options.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/parser/options.rb
diff --git a/railties/lib/vendor/thor/lib/thor/runner.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/runner.rb
index 330de38449..330de38449 100644
--- a/railties/lib/vendor/thor/lib/thor/runner.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/runner.rb
diff --git a/railties/lib/vendor/thor/lib/thor/shell.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/shell.rb
index 7ed4a24bfb..7ed4a24bfb 100644
--- a/railties/lib/vendor/thor/lib/thor/shell.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/shell.rb
diff --git a/railties/lib/vendor/thor/lib/thor/shell/basic.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/shell/basic.rb
index 6f1a2ade07..6f1a2ade07 100644
--- a/railties/lib/vendor/thor/lib/thor/shell/basic.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/shell/basic.rb
diff --git a/railties/lib/vendor/thor/lib/thor/shell/color.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/shell/color.rb
index 67afa65ed2..67afa65ed2 100644
--- a/railties/lib/vendor/thor/lib/thor/shell/color.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/shell/color.rb
diff --git a/railties/lib/vendor/thor/lib/thor/task.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/task.rb
index 92c0776c04..92c0776c04 100644
--- a/railties/lib/vendor/thor/lib/thor/task.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/task.rb
diff --git a/railties/lib/vendor/thor/lib/thor/tasks.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks.rb
index d1a7b1c673..d1a7b1c673 100644
--- a/railties/lib/vendor/thor/lib/thor/tasks.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks.rb
diff --git a/railties/lib/vendor/thor/lib/thor/tasks/install.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks/install.rb
index 6b20ff1634..6b20ff1634 100644
--- a/railties/lib/vendor/thor/lib/thor/tasks/install.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks/install.rb
diff --git a/railties/lib/vendor/thor/lib/thor/tasks/package.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks/package.rb
index 603d61b4ab..603d61b4ab 100644
--- a/railties/lib/vendor/thor/lib/thor/tasks/package.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks/package.rb
diff --git a/railties/lib/vendor/thor/lib/thor/tasks/spec.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks/spec.rb
index c7d00968e8..c7d00968e8 100644
--- a/railties/lib/vendor/thor/lib/thor/tasks/spec.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/tasks/spec.rb
diff --git a/railties/lib/vendor/thor/lib/thor/util.rb b/railties/lib/vendor/thor-0.11.0/lib/thor/util.rb
index 26db24aadb..26db24aadb 100644
--- a/railties/lib/vendor/thor/lib/thor/util.rb
+++ b/railties/lib/vendor/thor-0.11.0/lib/thor/util.rb
diff --git a/railties/lib/vendor/thor.rb b/railties/lib/vendor/thor.rb
index a98799ce08..a5383529c1 100644
--- a/railties/lib/vendor/thor.rb
+++ b/railties/lib/vendor/thor.rb
@@ -3,7 +3,7 @@ begin
   require 'rubygems'
   gem 'thor', '>= 0.11.0'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/thor/lib"
+  $:.unshift "#{File.dirname(__FILE__)}/thor-0.11.0/lib"
 end
 
 require 'thor'