aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/callbacks.rb
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-01-19 19:41:15 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-01-19 19:41:15 +1100
commiteaae58ce0c79aa5b4d6de16e2e67034b7fd971bb (patch)
treed2d3fc90f977020d4e389f526f7ce494a23c3e69 /actionpack/lib/action_dispatch/middleware/callbacks.rb
parentc5acbcbb0f72b9968decd702041dcb5b72574a28 (diff)
parentc71120e29caddda295c133adfb279870733a3f81 (diff)
downloadrails-eaae58ce0c79aa5b4d6de16e2e67034b7fd971bb.tar.gz
rails-eaae58ce0c79aa5b4d6de16e2e67034b7fd971bb.tar.bz2
rails-eaae58ce0c79aa5b4d6de16e2e67034b7fd971bb.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/callbacks.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/callbacks.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index 5ec406e134..d07841218a 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -45,8 +45,6 @@ module ActionDispatch
run_callbacks(:prepare) if @prepare_each_request
@app.call(env)
end
- ensure
- ActiveSupport::Notifications.instrument "action_dispatch.callback"
end
end
end