diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-23 07:33:54 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-23 07:33:54 +0200 |
| commit | 178044dbd2bd3ed44148e9b6d6584669aa4b2f93 (patch) | |
| tree | b2b39a701786a032657e18aa2f616f7f3c818ad0 /railties/lib | |
| parent | 33048b6e2738ff73b612dbcb35955189221dfbd0 (diff) | |
| download | rails-178044dbd2bd3ed44148e9b6d6584669aa4b2f93.tar.gz rails-178044dbd2bd3ed44148e9b6d6584669aa4b2f93.tar.bz2 rails-178044dbd2bd3ed44148e9b6d6584669aa4b2f93.zip | |
Do not try to use thor gem.
Diffstat (limited to 'railties/lib')
| -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' |