diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-02-18 22:14:53 +0100 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-02-18 22:14:53 +0100 |
commit | 873b0db220b92008ed833f0909ecab8861bf00e8 (patch) | |
tree | b84cb7114af9a4f5c30a8e19342a32e7ec18e42b /lib/gitlab/ldap | |
parent | 6524fbeaba7c16ae8ca514c7540a1aa6e86f4129 (diff) | |
download | gitlab-ce-873b0db220b92008ed833f0909ecab8861bf00e8.tar.gz |
Revert "Merge branch 'saml-decoupling' into 'master'
"
This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing
changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
Diffstat (limited to 'lib/gitlab/ldap')
-rw-r--r-- | lib/gitlab/ldap/user.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index b84c81f1a6c..e044f0ecc6d 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -24,10 +24,6 @@ module Gitlab update_user_attributes end - def save - super('LDAP') - end - # instance methods def gl_user @gl_user ||= find_by_uid_and_provider || find_by_email || build_new_user |