diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 00:08:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 00:08:13 +0300 |
commit | d3c29eae5c389e36d4751539fad0462053fb2b20 (patch) | |
tree | cc3ae497193f9334d0bc6ee4224637102f6e0d4e /lib/gitlab/auth | |
parent | ad4dbe36445360521fc73a57df13bc8f12eeaa92 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
-rw-r--r-- | lib/gitlab/auth/o_auth/provider.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gitlab/auth/o_auth/provider.rb b/lib/gitlab/auth/o_auth/provider.rb index e7d758353bf..4d6b95ecd1b 100644 --- a/lib/gitlab/auth/o_auth/provider.rb +++ b/lib/gitlab/auth/o_auth/provider.rb @@ -75,6 +75,12 @@ module Gitlab config = config_for(name) (config && config['label']) || LABELS[name] || name.titleize end + + def self.icon_for(name) + name = name.to_s + config = config_for(name) + config && config['icon'] + end end end end |