summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-05-20 21:09:49 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-05-21 12:26:49 -0500
commit063d80e9b6aa12284b8f611b174c66a1c35a7be8 (patch)
treec6c14834cbce2e742683909567f2a1ff5d270d70
parent2cbaf3c43a81ab73ddc84ced16ab200b91653a46 (diff)
downloadgitlab-ce-063d80e9b6aa12284b8f611b174c66a1c35a7be8.tar.gz
Merge branch 'issue_14684_2' into 'master'
current_user.confirmed_at.present? => current_user.confirmed? fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41 See merge request !4225
-rw-r--r--app/controllers/registrations_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 26eb15f49e4..75b78a49eab 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -38,7 +38,7 @@ class RegistrationsController < Devise::RegistrationsController
end
def after_sign_up_path_for(user)
- user.confirmed_at.present? ? dashboard_projects_path : users_almost_there_path
+ user.confirmed? ? dashboard_projects_path : users_almost_there_path
end
def after_inactive_sign_up_path_for(_resource)