diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-11 17:55:53 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-11 17:57:40 +0300 |
| commit | abd24d1c145fce609f9caed27c39ba758571ebd9 (patch) | |
| tree | 4f489699c4e9c923b505d709c757c326705601e2 /app | |
| parent | e72c25742d989c246a6903e16e67c9140815a088 (diff) | |
Merge branch 'bvl-terms-redirect-loop' into 'master'
Enforce terms acceptance before configuring 2FA
Closes #46256
See merge request gitlab-org/gitlab-ce!18896
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/users/terms_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/users/terms_controller.rb b/app/controllers/users/terms_controller.rb index 95c5c3432d5..ab685b9106e 100644 --- a/app/controllers/users/terms_controller.rb +++ b/app/controllers/users/terms_controller.rb @@ -3,6 +3,10 @@ module Users include InternalRedirect skip_before_action :enforce_terms! + skip_before_action :check_password_expiration + skip_before_action :check_two_factor_requirement + skip_before_action :require_email + before_action :terms layout 'terms' |