Automatic merge of gitlab-org/gitlab-ce master

0c176b19 · GitLab Bot · b2a6ffcf · 6359a1fa · 0c176b19 · 0c176b19
Commit 0c176b19 authored Jul 03, 2019 by GitLab Bot
3 changed files
--- a/app/assets/images/auth_buttons/salesforce_64.png
+++ b/app/assets/images/auth_buttons/salesforce_64.png
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
 # 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?

--- a/changelogs/unreleased/add-salesforce-logo.yml
+++ b/changelogs/unreleased/add-salesforce-logo.yml
+---
+title: Add salesforce logo for salesforce SSO
+merge_request: 28857
+author:
+type: changed