diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 14:24:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-23 14:24:16 +0000 |
| commit | 94f130cbfc0349c1b17d4882e7d5c367030b21d1 (patch) | |
| tree | a6c0258c256bece75fc5a5fcecc4fa2f74daed2a /lib | |
| parent | b51fe6831123830f729295e16bd5aa99e3012c57 (diff) | |
| parent | 4acd1f5d6a1942d4348b5d94e278fdb25c29e532 (diff) | |
| download | gitlab-ce-94f130cbfc0349c1b17d4882e7d5c367030b21d1.tar.gz | |
Merge branch 'admin-edit-identities' into 'master'
Admin can see, edit and remove user identities
Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !843
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/o_auth/provider.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/gitlab/o_auth/provider.rb b/lib/gitlab/o_auth/provider.rb new file mode 100644 index 00000000000..f986499a27c --- /dev/null +++ b/lib/gitlab/o_auth/provider.rb @@ -0,0 +1,19 @@ +module Gitlab + module OAuth + class Provider + def self.names + providers = [] + + Gitlab.config.ldap.servers.values.each do |server| + providers << server['provider_name'] + end + + Gitlab.config.omniauth.providers.each do |provider| + providers << provider['name'] + end + + providers + end + end + end +end |