summaryrefslogtreecommitdiff
path: root/app/views/devise
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-05-04 13:33:15 +0000
committerDouwe Maan <douwe@gitlab.com>2016-05-04 13:33:15 +0000
commit622ad2355a5b780091def7f7752ac88c97520dbb (patch)
treef838cd6bd9a4051a8e28b7ff76399599bdc3279e /app/views/devise
parenta4df822b2e759db05c37e00eec9e128b31c05974 (diff)
parenta6ba8647f919cca5f37f663502186d8b6b7642ec (diff)
downloadgitlab-ce-622ad2355a5b780091def7f7752ac88c97520dbb.tar.gz
Merge branch 'rs-unique-signup-fields' into 'master'
Improve uniqueness of field names on the signup form Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075 See merge request !3826
Diffstat (limited to 'app/views/devise')
-rw-r--r--app/views/devise/shared/_signup_box.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml
index e5607dacd0d..510215bb8cd 100644
--- a/app/views/devise/shared/_signup_box.html.haml
+++ b/app/views/devise/shared/_signup_box.html.haml
@@ -6,7 +6,7 @@
.login-heading
%h3 Create an account
.login-body
- = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+ = form_for(resource, as: "new_#{resource_name}", url: registration_path(resource_name)) do |f|
.devise-errors
= devise_error_messages!
%div
@@ -16,7 +16,7 @@
%div
= f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
.form-group.append-bottom-20#password-strength
- = f.password_field :password, class: "form-control bottom", id: "user_password_sign_up", placeholder: "Password", required: true
+ = f.password_field :password, class: "form-control bottom", placeholder: "Password", required: true
%div
- if current_application_settings.recaptcha_enabled
= recaptcha_tags