diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-16 12:31:16 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-08-16 12:31:16 +0000 |
| commit | b1604f7d8f0095d637036721244830e8d3181596 (patch) | |
| tree | 10caf704bd6326c31e808b5a437d0bdbef6a5ff3 /app/controllers/application_controller.rb | |
| parent | 1441b23a4a9edce15e356e1543f7ff6fafc105ba (diff) | |
| parent | 54ddc018ac71f0ec7379c8528144bb9192ced510 (diff) | |
| download | gitlab-ce-b1604f7d8f0095d637036721244830e8d3181596.tar.gz | |
Merge branch '47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flow' into 'master'
Soft email confirmation flow
Closes #47003
See merge request gitlab-org/gitlab-ce!31245
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5e65084a110..af6644b8fcc 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,6 +12,7 @@ class ApplicationController < ActionController::Base include EnforcesTwoFactorAuthentication include WithPerformanceBar include SessionlessAuthentication + include ConfirmEmailWarning before_action :authenticate_user! before_action :enforce_terms!, if: :should_enforce_terms? |