From c710aa3ffbb998fe8dafb9478924e043438a0666 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 25 Sep 2019 21:16:19 -0500
Subject: [PATCH] Fix #4177: Allow all users to change their username.

---
 app/controllers/user_name_change_requests_controller.rb    | 3 +--
 app/views/user_upgrades/new.html.erb                       | 6 ------
 app/views/users/edit.html.erb                              | 7 +------
 app/views/users/new.html.erb                               | 6 ------
 .../user_name_change_requests_controller_test.rb           | 2 +-
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/controllers/user_name_change_requests_controller.rb b/app/controllers/user_name_change_requests_controller.rb
index 3f7874f5c..99fe20894 100644
--- a/app/controllers/user_name_change_requests_controller.rb
+++ b/app/controllers/user_name_change_requests_controller.rb
@@ -1,6 +1,5 @@
 class UserNameChangeRequestsController < ApplicationController
-  before_action :member_only, :only => [:index, :show]
-  before_action :gold_only, :only => [:new, :create]
+  before_action :member_only, :only => [:index, :show, :new, :create]
   respond_to :html, :json, :xml
 
   def new
diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb
index a7784c5f2..efcc9d25d 100644
--- a/app/views/user_upgrades/new.html.erb
+++ b/app/views/user_upgrades/new.html.erb
@@ -86,12 +86,6 @@
               <td>Yes</td>
               <td>Yes</td>
             </tr>
-            <tr>
-              <td>Name Changes</td>
-              <td>No</td>
-              <td>Yes</td>
-              <td>Yes</td>
-            </tr>
           </tbody>
         </table>
       </div>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index a6f018cbf..068ce6dc1 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -11,12 +11,7 @@
       <fieldset id="basic-settings-section">
         <div class="input">
           <label>Name</label>
-          
-          <% if CurrentUser.user.is_gold? %>
-            <p><%= link_to "Change your name", new_user_name_change_request_path %></p>
-          <% else %>
-            <p>You must <%= link_to "upgrade your account", new_user_upgrade_path %> to request a name change</p>
-          <% end %>
+          <p><%= link_to "Change your name", new_user_name_change_request_path %></p>
         </div>
 
         <div class="input">
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 1e1fdde0c..4385abcd6 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -7,12 +7,6 @@
       comments. If you want <%= link_to "more features", new_user_upgrade_path %> you can upgrade your account later.
     </p>
 
-    <p>
-      <strong>This site is open to web crawlers, so whatever name you choose will be public</strong>. This includes
-      favorites, uploads, and comments. Almost everything is public. So don't choose a name you don't want to be
-      associated with.
-    </p>
-
     <div id="p3">
       <%= simple_form_for(@user, html: {id: "signup-form"}) do |f| %>
         <%= f.input :name, as: :string %>
diff --git a/test/functional/user_name_change_requests_controller_test.rb b/test/functional/user_name_change_requests_controller_test.rb
index f64be590f..a67196b20 100644
--- a/test/functional/user_name_change_requests_controller_test.rb
+++ b/test/functional/user_name_change_requests_controller_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 class UserNameChangeRequestsControllerTest < ActionDispatch::IntegrationTest
   context "The user name change requests controller" do
     setup do
-      @user = create(:gold_user)
+      @user = create(:member_user)
       @admin = create(:admin_user)
     end