diff options
| author | Janis Meybohm <janis.mey@posteo.de> | 2015-12-23 11:17:25 +0100 |
|---|---|---|
| committer | Janis Meybohm <janis.mey@posteo.de> | 2016-01-06 14:30:43 +0100 |
| commit | da53fcba2d0e46e47a8fd6a79591a6367e863d57 (patch) | |
| tree | c353942bf8b249852def165b044e901ed1e35ed3 /app | |
| parent | 8b39b8cd54bb73b485ee6ea7fc5d3bbfbe07cd5d (diff) | |
| download | gitlab-ce-da53fcba2d0e46e47a8fd6a79591a6367e863d57.tar.gz | |
Enable Microsoft Azure OAuth2 support
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/images/auth_buttons/azure_64.png | bin | 0 -> 986 bytes | |||
| -rw-r--r-- | app/helpers/auth_helper.rb | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/images/auth_buttons/azure_64.png b/app/assets/images/auth_buttons/azure_64.png Binary files differnew file mode 100644 index 00000000000..a82c751e001 --- /dev/null +++ b/app/assets/images/auth_buttons/azure_64.png diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index 0cfc0565e84..de669e529a7 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -1,5 +1,5 @@ module AuthHelper - PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook).freeze + PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2).freeze FORM_BASED_PROVIDERS = [/\Aldap/, 'crowd'].freeze def ldap_enabled? |
