diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-04 21:52:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-04 21:52:43 +0300 |
| commit | fd2b2dc1decab513af85dbed56a420c32953d803 (patch) | |
| tree | ec3cf72542eadb402737f0d5fc01c73cc2803151 /lib/gitlab | |
| parent | c6bfad2a672c4d2c623c8dd99a0dbc2138f325ab (diff) | |
| parent | f1a85747ca94cfe0aea25416da1e2ba498b636be (diff) | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/o_auth/user.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/o_auth/user.rb b/lib/gitlab/o_auth/user.rb index 7af75a9cc4c..0a91d3918d5 100644 --- a/lib/gitlab/o_auth/user.rb +++ b/lib/gitlab/o_auth/user.rb @@ -56,8 +56,6 @@ module Gitlab if external_provider? && @user @user.external = true - elsif @user - @user.external = false end @user |