Commit a599d812 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix/social-account-block' into 'master'

Fix Social Account Block

If you have omniauth enabled, but don't have one of the "Social" providers enabled (GitHub, Twitter, Google), the "Social Accounts" sections shows up, but without icons. This occurred when I was testing Shibboleth. This fixes the issues by checking if there are any `enabled_oauth_providers` rather than if just `Gitlab.config.omniauth.enabled`. Not quite sure how to implement a test for this, but it works :).
parents 7157f79c 9818775c
......@@ -10,7 +10,7 @@ module ProfileHelper
end
def show_profile_social_tab?
Gitlab.config.omniauth.enabled && !current_user.ldap_user?
enabled_social_providers.any? && !current_user.ldap_user?
end
def show_profile_remove_tab?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment