aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2013-04-19 10:27:35 -0700
committerDavid Heinemeier Hansson <david@loudthinking.com>2013-04-19 10:27:35 -0700
commiteaec0ec71f00f76f47811fc2f27761c7a73056b9 (patch)
tree9896ff811f86329bb635617d400854f6d0efa6db /railties/lib/rails
parent082c90da988ed8f35d9f91d047663da7b72d9245 (diff)
parent0920d4fccbfc41b6ccdae7070758fc2133280409 (diff)
downloadrails-eaec0ec71f00f76f47811fc2f27761c7a73056b9.tar.gz
rails-eaec0ec71f00f76f47811fc2f27761c7a73056b9.tar.bz2
rails-eaec0ec71f00f76f47811fc2f27761c7a73056b9.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/erb/scaffold/templates/index.html.erb4
1 files changed, 2 insertions, 2 deletions
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 1606b860dc..9d778642f2 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
@@ -15,9 +15,9 @@
<tbody>
<%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
<tr>
- <% attributes.reject(&:password_digest?).each do |attribute| -%>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
<td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
- <% end -%>
+<% end -%>
<td><%%= link_to 'Show', <%= singular_table_name %> %></td>
<td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
<td><%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>