diff options
| -rw-r--r-- | railties/lib/generators.rb | 2 | ||||
| -rw-r--r-- | railties/lib/vendor/thor.rb | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/railties/lib/generators.rb b/railties/lib/generators.rb index 45344bf45f..dd02eb3f64 100644 --- a/railties/lib/generators.rb +++ b/railties/lib/generators.rb @@ -11,7 +11,7 @@ end $:.unshift(File.dirname(__FILE__)) -require 'vendor/thor' +require 'vendor/thor-0.11.2/lib/thor' require 'generators/base' require 'generators/named_base' diff --git a/railties/lib/vendor/thor.rb b/railties/lib/vendor/thor.rb deleted file mode 100644 index 9919497c8f..0000000000 --- a/railties/lib/vendor/thor.rb +++ /dev/null @@ -1,9 +0,0 @@ -begin - # Prefer gems to the bundled libs. - require 'rubygems' - gem 'thor', '>= 0.11.2' -rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/thor-0.11.2/lib" -end - -require 'thor' |