aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Pinto <tapgyn@gmail.com>2013-06-08 13:36:41 -0400
committerThiago Pinto <tapgyn@gmail.com>2013-06-08 13:36:41 -0400
commit6de2644e9b92bb386e3ba1eb312995931e073434 (patch)
tree6e1a89204eb2cbdc1acb90933ec1b0114e63feac
parentb8640d47907876d43335628fea40da03df0e84cd (diff)
parent1f4c4c69ee5d0cc37ed35ffd3d27fb29c72751cf (diff)
downloadrails-6de2644e9b92bb386e3ba1eb312995931e073434.tar.gz
rails-6de2644e9b92bb386e3ba1eb312995931e073434.tar.bz2
rails-6de2644e9b92bb386e3ba1eb312995931e073434.zip
Merge branch 'master' of github.com:rails/docrails
-rw-r--r--guides/source/rails_on_rack.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/guides/source/rails_on_rack.md b/guides/source/rails_on_rack.md
index 4b77892dd3..2f36e4b8ac 100644
--- a/guides/source/rails_on_rack.md
+++ b/guides/source/rails_on_rack.md
@@ -131,6 +131,7 @@ use ActionDispatch::DebugExceptions
use ActionDispatch::RemoteIp
use ActionDispatch::Reloader
use ActionDispatch::Callbacks
+use ActiveRecord::Migration::CheckPending
use ActiveRecord::ConnectionAdapters::ConnectionManagement
use ActiveRecord::QueryCache
use ActionDispatch::Cookies
@@ -272,6 +273,11 @@ Much of Action Controller's functionality is implemented as Middlewares. The fol
* Runs the prepare callbacks before serving the request.
+
+ **`ActiveRecord::Migration::CheckPending`**
+
+* Checks pending migrations and raise an error if migrations are pending.
+
**`ActiveRecord::ConnectionAdapters::ConnectionManagement`**
* Cleans active connections after each request, unless the `rack.test` key in the request environment is set to `true`.