diff --git a/Gemfile.lock b/Gemfile.lock index f79e12d2aa..7435032e02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,7 @@ GEM faraday (0.6.1) addressable (~> 2.2.4) multipart-post (~> 1.1.0) - rack (< 2, >= 1.1.0) + rack (>= 1.1.0, < 2) fastthread (1.0.7) ffi (1.0.9) foreman (0.19.0) diff --git a/app/views/users/form/_new.haml b/app/views/users/form/_new.haml index da7c46e0aa..78773d22a4 100644 --- a/app/views/users/form/_new.haml +++ b/app/views/users/form/_new.haml @@ -47,10 +47,10 @@ = f.password_field :password_confirmation, :autocomplete => 'off' = errors_for user, :password_confirmation -/ - build_user_phone_number(user) -/ - f.fields_for :card do |card| -/ - card.fields_for :phone_numbers do |phone| -/ .phone_number.text_field -/ = phone.label :name, t('users.form.phone') -/ = phone.text_field :name -/ .field_note= t('users.form.phone_for_integration') + - build_user_phone_number(user) + = f.fields_for :card do |card| + = card.fields_for :phone_numbers do |phone| + .phone_number.text_field + = phone.label :name, t('users.form.phone') + = phone.text_field :name + .field_note= t('users.form.phone_for_integration')