diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 18:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 18:09:37 +0300 |
| commit | 8a840df2e433bc39d033b20e64402fa3f56445d3 (patch) | |
| tree | 92a941d06b5ddd3ad3f7ad846bf83f0c33d57dbb /app/helpers/auth_helper.rb | |
| parent | 5c8c561ac63d7b8f372316b4409500474220fcda (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/auth_helper.rb')
| -rw-r--r-- | app/helpers/auth_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index 1f1ff75359d..12f75217a8a 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -145,6 +145,10 @@ module AuthHelper IdentityProviderPolicy.new(current_user, provider).can?(:link) end + def allow_admin_mode_password_authentication_for_web? + current_user.allow_password_authentication_for_web? && !current_user.password_automatically_set? + end + extend self end |