diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 14:34:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-26 14:34:31 +0000 |
commit | c85ab58601ab9ac12cd72fa8a96b298875b37039 (patch) | |
tree | 165c7a04f5e77f9aa422667f37e901c960019f65 /app | |
parent | 5bc4a1efecfffbd467d7e2e2f42f3f1bf6e6f030 (diff) | |
download | gitlab-ce-c85ab58601ab9ac12cd72fa8a96b298875b37039.tar.gz |
Add latest changes from gitlab-org/security/gitlab@13-0-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 2a4e659c5b9..f6ad2bf5312 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -4,6 +4,8 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController include Gitlab::Experimentation::ControllerConcern include InitializesCurrentUserMode + before_action :verify_confirmed_email!, only: [:new] + layout 'profile' # Overridden from Doorkeeper::AuthorizationsController to @@ -21,4 +23,13 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController render "doorkeeper/authorizations/error" end end + + private + + def verify_confirmed_email! + return if current_user&.confirmed? + + pre_auth.error = :unconfirmed_email + render "doorkeeper/authorizations/error" + end end |