diff options
| author | Alexey Gaziev <alex.gaziev@gmail.com> | 2011-06-20 20:13:52 +0400 |
|---|---|---|
| committer | Alexey Gaziev <alex.gaziev@gmail.com> | 2011-06-20 20:13:52 +0400 |
| commit | 78cd3f9ec262a6da8283a6ec95751a0bcd776051 (patch) | |
| tree | cfe108232dd76349f83cfb0232edcada2b4f988b /railties | |
| parent | ca044113f38ed900fe30790c87a87089e4e9bcee (diff) | |
| download | rails-78cd3f9ec262a6da8283a6ec95751a0bcd776051.tar.gz rails-78cd3f9ec262a6da8283a6ec95751a0bcd776051.tar.bz2 rails-78cd3f9ec262a6da8283a6ec95751a0bcd776051.zip | |
Removed rescue branch for Rails 2.x compatibility
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index bf1b7a5e85..ea9f023511 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -299,9 +299,6 @@ module Rails return rescue LoadError => e raise unless e.message =~ /#{Regexp.escape(path)}$/ - rescue NameError => e - raise unless e.message =~ /Rails::Generator(\s|::|$)/ - warn "[WARNING] Could not load generator #{path.inspect} because it's a Rails 2.x generator, which is not supported anymore. Error: #{e.message}.\n#{e.backtrace.join("\n")}" rescue Exception => e warn "[WARNING] Could not load generator #{path.inspect}. Error: #{e.message}.\n#{e.backtrace.join("\n")}" end |