aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 10:02:14 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 18:07:08 -0200
commit786a0b74754194aa893497ff60f0d60a56404e5a (patch)
tree2d548107207388d70568a09d80114246f0adf0ed
parente5e87041ceafc64d11a01e5a1c7ce1f978a788a6 (diff)
downloadrails-786a0b74754194aa893497ff60f0d60a56404e5a.tar.gz
rails-786a0b74754194aa893497ff60f0d60a56404e5a.tar.bz2
rails-786a0b74754194aa893497ff60f0d60a56404e5a.zip
Remove duplicated constant definition
ActionController::ActionControllerError is already defined in action_controller/metal/exceptions.
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 9895b2b4b5..7b73f86584 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -4,9 +4,6 @@ module ActionController
module Compatibility
extend ActiveSupport::Concern
- class ::ActionController::ActionControllerError < StandardError #:nodoc:
- end
-
# Temporary hax
included do
::ActionController::UnknownAction = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('ActionController::UnknownAction', '::AbstractController::ActionNotFound')