diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-07-03 16:03:21 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-07-03 16:03:21 +0000 |
| commit | 6359a1fabdca65af1c1a514fda44a32bbfe5c4ec (patch) | |
| tree | 883943bcf6bd9f5831e821887d9d353dd111f8ce | |
| parent | 03ee977a0aabb69abbd0a966597c3114402c808f (diff) | |
| parent | 55ed4a405e814453f2f1722214e61deffd799c4f (diff) | |
| download | gitlab-ce-6359a1fabdca65af1c1a514fda44a32bbfe5c4ec.tar.gz | |
Merge branch 'add-salesforce-logo' into 'master'
Add salesforce logo for salesforce SSO
Closes #62607
See merge request gitlab-org/gitlab-ce!28857
| -rw-r--r-- | app/assets/images/auth_buttons/salesforce_64.png | bin | 0 -> 8774 bytes | |||
| -rw-r--r-- | app/helpers/auth_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/add-salesforce-logo.yml | 5 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/images/auth_buttons/salesforce_64.png b/app/assets/images/auth_buttons/salesforce_64.png Binary files differnew file mode 100644 index 00000000000..c8a86a0c515 --- /dev/null +++ b/app/assets/images/auth_buttons/salesforce_64.png diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index 076976175a9..31c4b27273b 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module AuthHelper - PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq).freeze + PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq salesforce).freeze LDAP_PROVIDER = /\Aldap/.freeze def ldap_enabled? diff --git a/changelogs/unreleased/add-salesforce-logo.yml b/changelogs/unreleased/add-salesforce-logo.yml new file mode 100644 index 00000000000..13766821b88 --- /dev/null +++ b/changelogs/unreleased/add-salesforce-logo.yml @@ -0,0 +1,5 @@ +--- +title: Add salesforce logo for salesforce SSO +merge_request: 28857 +author: +type: changed |
