diff options
author | Patricio Cano <patricio@gitlab.com> | 2014-10-22 20:39:02 -0500 |
---|---|---|
committer | Patricio Cano <patricio@gitlab.com> | 2014-10-22 20:39:02 -0500 |
commit | 7039c9868a3209d89f8306c65ca5b74f8e2ea2c0 (patch) | |
tree | aa9f2c79b84374b1c86704a8d2abc0d0f6e41526 /app | |
parent | 10528341c296fafca8388159d7b0023cd2ffb1cb (diff) | |
download | gitlab-ce-7039c9868a3209d89f8306c65ca5b74f8e2ea2c0.tar.gz |
Updated the IDs of the fields, so that it wouldn't mess with many tests
Updated some tests to match new IDs
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/password_strength.js.coffee | 2 | ||||
-rw-r--r-- | app/views/profiles/passwords/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/passwords/new.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/password_strength.js.coffee b/app/assets/javascripts/password_strength.js.coffee index 61e25deac4c..696a5ccf0b9 100644 --- a/app/assets/javascripts/password_strength.js.coffee +++ b/app/assets/javascripts/password_strength.js.coffee @@ -29,6 +29,6 @@ $(document).ready -> deviseOptions.rules = activated: overwritten_rules - $("#user_password").pwstrength profileOptions + $("#user_password_profile").pwstrength profileOptions $("#user_password_sign_up").pwstrength deviseOptions $("#user_password_recover").pwstrength deviseOptions diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml index 4440dcf338d..8e84d312194 100644 --- a/app/views/profiles/passwords/edit.html.haml +++ b/app/views/profiles/passwords/edit.html.haml @@ -24,7 +24,7 @@ .form-group#password-strength = f.label :password, 'New password', class: 'control-label' .col-sm-10 - = f.password_field :password, required: true, class: 'form-control' + = f.password_field :password, required: true, class: 'form-control', id: 'user_password_profile' .form-group = f.label :password_confirmation, class: 'control-label' .col-sm-10 diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml index b52514668e3..746b3a721e1 100644 --- a/app/views/profiles/passwords/new.html.haml +++ b/app/views/profiles/passwords/new.html.haml @@ -16,7 +16,7 @@ .col-sm-10= f.password_field :current_password, required: true, class: 'form-control' .form-group#password-strength = f.label :password, class: 'control-label' - .col-sm-10= f.password_field :password, required: true, class: 'form-control' + .col-sm-10= f.password_field :password, required: true, class: 'form-control', id: 'user_password_profile' .form-group = f.label :password_confirmation, class: 'control-label' .col-sm-10 |