aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-02-26 08:57:48 -0800
committerXavier Noria <fxn@hashref.com>2013-02-26 08:57:48 -0800
commit62b783e5319f715794b8976f424bfacb85da9c1f (patch)
tree7ef45e02d3fd2f581aec6a4062d62fd36a9adc14 /railties
parent3d9cfe09ade284f6c99e45d6d44623c2574d9947 (diff)
parent3f9baeb2ec08138a0da09870ae60fd6b8165c07f (diff)
downloadrails-62b783e5319f715794b8976f424bfacb85da9c1f.tar.gz
rails-62b783e5319f715794b8976f424bfacb85da9c1f.tar.bz2
rails-62b783e5319f715794b8976f424bfacb85da9c1f.zip
Merge pull request #9442 from czarneckid/adjust-generator-language
Use less hyperbole in the language re: allowed parameters
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 72281a2fef..73e89086a5 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -56,7 +56,7 @@ class <%= controller_class_name %>Controller < ApplicationController
@<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
end
- # Never trust parameters from the scary internet, only allow the white list through.
+ # Only allow a trusted parameter "white list" through.
def <%= "#{singular_table_name}_params" %>
<%- if attributes_names.empty? -%>
params[<%= ":#{singular_table_name}" %>]