Merge branch 'master' of git://github.com/rails/rails into old

1 files changed, 12 insertions, 0 deletions

diff --git a/actionpack/lib/abstract_controller/exceptions.rb b/actionpack/lib/abstract_controller/exceptions.rb
new file mode 100644
index 0000000000..b671516de1
--- /dev/null
+++ b/actionpack/lib/abstract_controller/exceptions.rb
@@ -0,0 +1,12 @@
+module AbstractController
+  class Error < StandardError; end
+  class ActionNotFound < StandardError; end
+
+  class DoubleRenderError < Error
+    DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"."
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
+  end
+end