diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-07-09 12:20:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-07-09 12:20:24 +0200 |
| commit | b65bd01d555651e278099ec2fe5cf9c7db7608d9 (patch) | |
| tree | b275ac1809531f396e0edcb02776d849c81eff2f /actionpack/lib/action_controller/metal | |
| parent | 6917c65f048b3b5d09ac80271b0c94eae0120f0c (diff) | |
| parent | 1835aba6f176950b3d5532895f90b8a92a23f476 (diff) | |
| download | rails-b65bd01d555651e278099ec2fe5cf9c7db7608d9.tar.gz rails-b65bd01d555651e278099ec2fe5cf9c7db7608d9.tar.bz2 rails-b65bd01d555651e278099ec2fe5cf9c7db7608d9.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/helpers.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/responder.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb index 75757db564..2df0e9422c 100644 --- a/actionpack/lib/action_controller/metal/helpers.rb +++ b/actionpack/lib/action_controller/metal/helpers.rb @@ -29,7 +29,7 @@ module ActionController # class EventsController < ActionController::Base # helper FormattedTimeHelper # def index - # @events = Event.find(:all) + # @events = Event.all # end # end # diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb index f3b7357e64..3794e277f6 100644 --- a/actionpack/lib/action_controller/metal/responder.rb +++ b/actionpack/lib/action_controller/metal/responder.rb @@ -9,7 +9,7 @@ module ActionController #:nodoc: # respond_to :html, :xml, :json # # def index - # @people = Person.find(:all) + # @people = Person.all # respond_with(@people) # end # end |