diff --git a/app/models/user_name_change_request.rb b/app/models/user_name_change_request.rb index dd798711d..3b8daded1 100644 --- a/app/models/user_name_change_request.rb +++ b/app/models/user_name_change_request.rb @@ -5,7 +5,6 @@ class UserNameChangeRequest < ApplicationRecord belongs_to :approver, class_name: "User", optional: true validate :not_limited, on: :create - validates :desired_name, user_name: true, confirmation: true, on: :create validates :original_name, presence: true validates :desired_name, presence: true diff --git a/app/policies/user_name_change_request_policy.rb b/app/policies/user_name_change_request_policy.rb index 1d3782a36..84078526e 100644 --- a/app/policies/user_name_change_request_policy.rb +++ b/app/policies/user_name_change_request_policy.rb @@ -10,6 +10,6 @@ class UserNameChangeRequestPolicy < ApplicationPolicy end def permitted_attributes - [:desired_name, :desired_name_confirmation] + [:desired_name] end end diff --git a/app/views/user_name_change_requests/new.html.erb b/app/views/user_name_change_requests/new.html.erb index 0c7698c55..5d8270f19 100644 --- a/app/views/user_name_change_requests/new.html.erb +++ b/app/views/user_name_change_requests/new.html.erb @@ -27,8 +27,7 @@ <%= edit_form_for(@change_request) do |f| %> <%= f.input :desired_name, label: "New name" %> - <%= f.input :desired_name_confirmation, label: "Confirm name" %> - <%= f.submit "Submit", "data-confirm": "Are you sure you want to change your name?" %> + <%= f.submit "Submit" %> <% end %> diff --git a/test/functional/user_name_change_requests_controller_test.rb b/test/functional/user_name_change_requests_controller_test.rb index d8e6abf40..e8183a463 100644 --- a/test/functional/user_name_change_requests_controller_test.rb +++ b/test/functional/user_name_change_requests_controller_test.rb @@ -23,7 +23,7 @@ class UserNameChangeRequestsControllerTest < ActionDispatch::IntegrationTest context "create action" do should "work" do - post_auth user_name_change_requests_path, @user, params: { user_name_change_request: { desired_name: "zun", desired_name_confirmation: "zun" }} + post_auth user_name_change_requests_path, @user, params: { user_name_change_request: { desired_name: "zun" }} assert_redirected_to profile_path assert_equal("zun", @user.reload.name)