aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-17 10:16:17 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-17 10:16:17 -0700
commitad707a1f16dea6a93f37feed711ec0b51c2d3ab6 (patch)
tree7732b0c583b2d195cb350fe5a1ab1d4757681e88 /railties
parent2e3880ca6278ea6a9e938393b1288ded07868654 (diff)
parentf0e4254bfa1443c3d51af117b925a02b88076f58 (diff)
downloadrails-ad707a1f16dea6a93f37feed711ec0b51c2d3ab6.tar.gz
rails-ad707a1f16dea6a93f37feed711ec0b51c2d3ab6.tar.bz2
rails-ad707a1f16dea6a93f37feed711ec0b51c2d3ab6.zip
Merge pull request #10970 from sbagdat/patch-1
Use Colspan in th Tags
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/lib/rails/generators/erb/scaffold/templates/index.html.erb4
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 23a7cf6ca3..ae4bfc2447 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -12,5 +12,9 @@
moved to class methods in Railtie and the Railtie has been made abstract.
*John Wang*
+
+* Changes repetitive th tags to use colspan attribute in `index.html.erb` template.
+
+ *Sıtkı Bağdat*
Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/railties/CHANGELOG.md) for previous changes.
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
index 9d778642f2..814d6fdb0e 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
@@ -6,9 +6,7 @@
<% attributes.reject(&:password_digest?).each do |attribute| -%>
<th><%= attribute.human_name %></th>
<% end -%>
- <th></th>
- <th></th>
- <th></th>
+ <th colspan="3"></th>
</tr>
</thead>