aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/performance_testing.textile
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-06-30 23:15:22 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-06-30 23:15:22 +0530
commit6b9d1a0db2f7829509689d244d6a5eda5210401d (patch)
tree2d4920fa5e2f3d8571573d5aee717cac261c53ac /guides/source/performance_testing.textile
parent4662c5f4effd829099d647a7a76c7044fcc68121 (diff)
parent32c28e8214940fe6b06043b280e8d342e16eb3c6 (diff)
downloadrails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.gz
rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.tar.bz2
rails-6b9d1a0db2f7829509689d244d6a5eda5210401d.zip
Merge branch 'master' of github.com:lifo/docrails
Conflicts: activemodel/lib/active_model/errors.rb
Diffstat (limited to 'guides/source/performance_testing.textile')
-rw-r--r--guides/source/performance_testing.textile6
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/performance_testing.textile b/guides/source/performance_testing.textile
index 958b13cd9e..982fd1b070 100644
--- a/guides/source/performance_testing.textile
+++ b/guides/source/performance_testing.textile
@@ -524,11 +524,11 @@ Please refer to the "API docs":http://api.rubyonrails.org/classes/ActiveRecord/B
h4. Controller
-Similarly, you could use this helper method inside "controllers":http://api.rubyonrails.org/classes/ActionController/Benchmarking/ClassMethods.html#M000715
+Similarly, you could use this helper method inside "controllers":http://api.rubyonrails.org/classes/ActiveSupport/Benchmarkable.html
<ruby>
def process_projects
- self.class.benchmark("Processing projects") do
+ benchmark("Processing projects") do
Project.process(params[:project_ids])
Project.update_cached_projects
end
@@ -539,7 +539,7 @@ NOTE: +benchmark+ is a class method inside controllers
h4. View
-And in "views":http://api.rubyonrails.org/classes/ActionController/Benchmarking/ClassMethods.html#M000715:
+And in "views":http://api.rubyonrails.org/classes/ActiveSupport/Benchmarkable.html:
<erb>
<% benchmark("Showing projects partial") do %>