diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 06:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-13 06:09:05 +0300 |
| commit | 56a7627af0b4cc9fa9869bff88c8a3c81ca931c6 (patch) | |
| tree | 47beee69e05889a30d4569192be3012d0ee2749c /app/controllers/registrations_controller.rb | |
| parent | 47d1f417f03aca055b2ba49c32bb6fb01c459831 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/registrations_controller.rb')
| -rw-r--r-- | app/controllers/registrations_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index c54687c432c..1c6cbf72cfa 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -55,8 +55,6 @@ class RegistrationsController < Devise::RegistrationsController def welcome 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? - - current_user.name = nil if current_user.name == current_user.username end def update_registration |