diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-31 11:21:40 +0100 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2017-08-31 19:32:00 +0100 |
| commit | 60fe4b61b11e87dcae3864e791852bffbd204193 (patch) | |
| tree | 004a6380cd9d8ee0d51cb43c10e22488cc386dea /app/models/user.rb | |
| parent | d546f7d36e6703bda430e2f50fe4e87a07ab48f8 (diff) | |
| download | gitlab-ce-37202-revert-changes-to-signing-enabled.tar.gz | |
Rollsback changes made to signing_enabled.37202-revert-changes-to-signing-enabled
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index fbd08bc4d0a..3a067f2332e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -600,8 +600,8 @@ class User < ActiveRecord::Base password_automatically_set? && allow_password_authentication? end - def require_personal_access_token_creation_for_git_auth? - return false if allow_password_authentication? || ldap_user? + def require_personal_access_token? + return false if current_application_settings.password_authentication_enabled? || ldap_user? PersonalAccessTokensFinder.new(user: self, impersonation: false, state: 'active').execute.none? end |