aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--guides/CHANGELOG.md4
-rw-r--r--guides/source/getting_started.md7
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/lib/rails/generators/erb/scaffold/templates/index.html.erb4
4 files changed, 10 insertions, 9 deletions
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index 766f7f6f56..37257baeba 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1,3 +1,5 @@
-* No changes.
+* Removed repetitive th tags. Instead of them added one th tag with a colspan attribute.
+
+ *Sıtkı Bağdat*
Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/guides/CHANGELOG.md) for previous changes.
diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md
index 2fb0cd7c72..0d44f0e776 100644
--- a/guides/source/getting_started.md
+++ b/guides/source/getting_started.md
@@ -932,8 +932,7 @@ appear next to the "Show" link:
<tr>
<th>Title</th>
<th>Text</th>
- <th></th>
- <th></th>
+ <th colspan="2"></th>
</tr>
<% @posts.each do |post| %>
@@ -1073,9 +1072,7 @@ together.
<tr>
<th>Title</th>
<th>Text</th>
- <th></th>
- <th></th>
- <th></th>
+ <th colspan="3"></th>
</tr>
<% @posts.each do |post| %>
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>