Commit 36dc3d28 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'remove-leftover-assignment' into 'master'

Remove leftover assignment from earlier iteration

See merge request gitlab-org/gitlab!24867
parents c80d2e29 efb4ed2d
...@@ -55,8 +55,6 @@ class RegistrationsController < Devise::RegistrationsController ...@@ -55,8 +55,6 @@ class RegistrationsController < Devise::RegistrationsController
def welcome def welcome
return redirect_to new_user_registration_path unless current_user return redirect_to new_user_registration_path unless current_user
return redirect_to stored_location_or_dashboard(current_user) if current_user.role.present? && !current_user.setup_for_company.nil? return redirect_to stored_location_or_dashboard(current_user) if current_user.role.present? && !current_user.setup_for_company.nil?
current_user.name = nil if current_user.name == current_user.username
end end
def update_registration def update_registration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment