diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-04 12:42:22 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-04 12:42:22 +0530 |
| commit | 02b9c22df8053d71782ae11900d0194f217afc3c (patch) | |
| tree | 8a581720153199868492fb6ebec7be54573a1861 /actionpack/lib | |
| parent | e25eeed5b873f05f9614ecf6720c0eb636d52b63 (diff) | |
| parent | f89f74896b711d5b073289c9e485e3357c032cc8 (diff) | |
| download | rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.gz rails-02b9c22df8053d71782ae11900d0194f217afc3c.tar.bz2 rails-02b9c22df8053d71782ae11900d0194f217afc3c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/engines.textile
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/responder.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index fbb5d01e86..f467b74256 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -74,7 +74,7 @@ module ActionController #:nodoc: # # respond_to do |format| # format.html - # format.xml { render :xml => @people.to_xml } + # format.xml { render :xml => @people } # end # end # @@ -389,7 +389,7 @@ module ActionController #:nodoc: # # respond_to do |format| # format.html - # format.xml { render :xml => @people.to_xml } + # format.xml { render :xml => @people } # end # # In this usage, the argument passed to the block (+format+ above) is an diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb index 1e8990495c..83407846dc 100644 --- a/actionpack/lib/action_controller/metal/responder.rb +++ b/actionpack/lib/action_controller/metal/responder.rb @@ -63,7 +63,7 @@ module ActionController #:nodoc: # # def create # @project = Project.find(params[:project_id]) - # @task = @project.comments.build(params[:task]) + # @task = @project.tasks.build(params[:task]) # flash[:notice] = 'Task was successfully created.' if @task.save # respond_with(@project, @task) # end |