aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb3
-rw-r--r--railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb3
3 files changed, 4 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 9bf31b0d55..7d17f1b0f5 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Update scaffold to use labels instead of bold tags. Closes #10757 [zach-inglis-lt3]
+
* Resurrect WordNet synonym lookups. #10710 [tom./, matt]
* Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) [DHH]
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
index 8a65b50db1..73b200ba63 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
@@ -5,10 +5,9 @@
<%% form_for(@<%= singular_name %>) do |f| %>
<% for attribute in attributes -%>
<p>
- <b><%= attribute.column.human_name %></b><br />
+ <%%= f.label :<%= attribute.name %> %><br />
<%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
</p>
-
<% end -%>
<p>
<%%= f.submit "Update" %>
diff --git a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
index 96f59900b6..e5de92222d 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
+++ b/railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
@@ -5,10 +5,9 @@
<%% form_for(@<%= singular_name %>) do |f| %>
<% for attribute in attributes -%>
<p>
- <b><%= attribute.column.human_name %></b><br />
+ <%%= f.label :<%= attribute.name %> %><br />
<%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
</p>
-
<% end -%>
<p>
<%%= f.submit "Create" %>