aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-03-30 13:41:01 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-03-30 13:41:01 -0700
commitc3d482f0b24dd9cddfbd8ea88976abbcc1e93f85 (patch)
tree22c28e4774552e4c352babf1314a3d7dfcbefc7c /actionpack/lib
parent86aefdb4f2b957acc6d6c7eef557dff6a3888803 (diff)
parent0d2a4009cab21badcdf6644ba644a2bb67a06e83 (diff)
downloadrails-c3d482f0b24dd9cddfbd8ea88976abbcc1e93f85.tar.gz
rails-c3d482f0b24dd9cddfbd8ea88976abbcc1e93f85.tar.bz2
rails-c3d482f0b24dd9cddfbd8ea88976abbcc1e93f85.zip
Merge pull request #5673 from avakhov/ac-render-exception
Remove AC::RenderError class second declaration
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/exceptions.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index ece9ba3725..505b2ac609 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -30,9 +30,6 @@ module ActionController
class MissingFile < ActionControllerError #:nodoc:
end
- class RenderError < ActionControllerError #:nodoc:
- end
-
class SessionOverflowError < ActionControllerError #:nodoc:
DEFAULT_MESSAGE = 'Your session data is larger than the data column in which it is to be stored. You must increase the size of your data column if you intend to store large data.'