diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 09:08:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 09:08:43 +0000 |
| commit | 26384c9a61da9922b8fa4b8351d4e42d51661b37 (patch) | |
| tree | ef3decbed644db3c97dcdbb5b71d4ade77f3155d /app/controllers/concerns | |
| parent | 79cbe31b18159ea394c6f6e3027c1dc69bdabb75 (diff) | |
| download | gitlab-ce-26384c9a61da9922b8fa4b8351d4e42d51661b37.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/confirm_email_warning.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/confirm_email_warning.rb b/app/controllers/concerns/confirm_email_warning.rb index 32e1a46e580..f1c0bcd491d 100644 --- a/app/controllers/concerns/confirm_email_warning.rb +++ b/app/controllers/concerns/confirm_email_warning.rb @@ -10,7 +10,7 @@ module ConfirmEmailWarning protected def show_confirm_warning? - html_request? && request.get? && Feature.enabled?(:soft_email_confirmation) + html_request? && request.get? end def set_confirm_warning |