diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:08:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:08:08 +0000 |
| commit | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (patch) | |
| tree | c084a29873f0fe6ff42555c590da6a9d8527df91 /lib | |
| parent | 87ef501eacd66d7166183d20d84e33de022f7002 (diff) | |
| download | gitlab-ce-f1e2fca19a90a6992c2020cf8c2159cfb0b61bca.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/auth/o_auth/provider.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/auth/o_auth/provider.rb b/lib/gitlab/auth/o_auth/provider.rb index 3d44c83736a..e7d758353bf 100644 --- a/lib/gitlab/auth/o_auth/provider.rb +++ b/lib/gitlab/auth/o_auth/provider.rb @@ -7,7 +7,8 @@ module Gitlab LABELS = { "github" => "GitHub", "gitlab" => "GitLab.com", - "google_oauth2" => "Google" + "google_oauth2" => "Google", + "azure_oauth2" => "Azure AD" }.freeze def self.authentication(user, provider) |