kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #14099 from robertomiranda/render-text-2-plain

Browse source 
Update Docs in favor to use render plain instead of text option
This commit is contained in:
Guillermo Iguaran 2014-02-18 15:11:33 -05:00
commit 11645adf25
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionmailer/lib/action_mailer/base.rb
View file

@ -724,11 +724,11 @@ module ActionMailer
# format.html
# end
#
# You can even render text directly without using a template:
# You can even render plain directly without using a template:
#
# mail(to: 'mikel@test.lindsaar.net') do |format|
# format.text { render text: "Hello Mikel!" }
# format.html { render text: "<h1>Hello Mikel!</h1>" }
# format.text { render plain: "Hello Mikel!" }
# format.html { render plain: "<h1>Hello Mikel!</h1>" }
# end
#
# Which will render a +multipart/alternative+ email with +text/plain+ and

2
actionpack/lib/action_controller/base.rb
View file

@ -45,7 +45,7 @@ module ActionController
#
# def server_ip
# location = request.env["SERVER_ADDR"]
# render text: "This server hosted at #{location}"
# render plain: "This server hosted at #{location}"
# end
#
# == Parameters

2
actionpack/lib/action_controller/metal/data_streaming.rb
View file

@ -96,7 +96,7 @@ module ActionController #:nodoc:
end
# Sends the given binary data to the browser. This method is similar to
# <tt>render text: data</tt>, but also allows you to specify whether
# <tt>render plain: data</tt>, but also allows you to specify whether
# the browser should display the response as a file attachment (i.e. in a
# download dialog) or as inline data. You may also set the content type,
# the apparent file name, and other things.

12
actionpack/lib/action_controller/metal/http_authentication.rb
View file

@ -11,11 +11,11 @@ module ActionController
# http_basic_authenticate_with name: "dhh", password: "secret", except: :index
#
# def index
# render text: "Everyone can see me!"
# render plain: "Everyone can see me!"
# end
#
# def edit
# render text: "I'm only accessible if you know the password"
# render plain: "I'm only accessible if you know the password"
# end
# end
#
@ -127,11 +127,11 @@ module ActionController
# before_action :authenticate, except: [:index]
#
# def index
# render text: "Everyone can see me!"
# render plain: "Everyone can see me!"
# end
#
# def edit
# render text: "I'm only accessible if you know the password"
# render plain: "I'm only accessible if you know the password"
# end
#
# private
@ -321,11 +321,11 @@ module ActionController
# before_action :authenticate, except: [ :index ]
#
# def index
# render text: "Everyone can see me!"
# render plain: "Everyone can see me!"
# end
#
# def edit
# render text: "I'm only accessible if you know the password"
# render plain: "I'm only accessible if you know the password"
# end
#
# private