diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-04-19 16:00:45 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-04-19 16:00:45 -0400 |
| commit | a6ba8647f919cca5f37f663502186d8b6b7642ec (patch) | |
| tree | 87cff6fa53a9796b00872db3d8f1bf25f50b4147 /app | |
| parent | 6a19467c415487ae786df12b04f62647132986ac (diff) | |
| download | gitlab-ce-a6ba8647f919cca5f37f663502186d8b6b7642ec.tar.gz | |
Improve uniqueness of field names on the signup formrs-unique-signup-fields
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/registrations_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index c48175a4c5a..b441b34d0be 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -8,6 +8,13 @@ class RegistrationsController < Devise::RegistrationsController def create if !Gitlab::Recaptcha.load_configurations! || verify_recaptcha + # To avoid duplicate form fields on the login page, the registration form + # names fields using `new_user`, but Devise still wants the params in + # `user`. + if params["new_#{resource_name}"].present? && params[resource_name].blank? + params[resource_name] = params.delete(:"new_#{resource_name}") + end + super else flash[:alert] = "There was an error with the reCAPTCHA code below. Please re-enter the code." 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 |