diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-07-29 12:20:35 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-07-29 12:22:22 +0200 |
| commit | 94abb92c8d95ed69254876397226a56a6f041c70 (patch) | |
| tree | caafe7372e1692412b96d6996cb440ecdcd9ef58 /railties | |
| parent | 540bc3d9b16d33e5c95efa3bbe446264d9c36ff5 (diff) | |
| parent | ed29c0a96b266f1c45511c55507308d6116799d5 (diff) | |
| download | rails-94abb92c8d95ed69254876397226a56a6f041c70.tar.gz rails-94abb92c8d95ed69254876397226a56a6f041c70.tar.bz2 rails-94abb92c8d95ed69254876397226a56a6f041c70.zip | |
Merge pull request #16328 from noinkling/template_password_confirmation_fix
Give password_confirmation div the "field" class in the scaffold generator "_form" partial
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index e9abfac7a0..651f40007e 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +* Scaffold generator `_form` partial adds `class="field"` for password + confirmation fields. + + *noinkling* + * Add `Rails::Application.config_for` to load a configuration for the current environment. diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb index da99e74435..bba9141fb8 100644 --- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb +++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb @@ -17,7 +17,7 @@ <%%= f.label :password %><br> <%%= f.password_field :password %> </div> - <div> + <div class="field"> <%%= f.label :password_confirmation %><br> <%%= f.password_field :password_confirmation %> <% else -%> |