kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
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 :).
This commit is contained in:
Dmitriy Zaporozhets 2014-03-11 15:02:07 +00:00
commit a599d8120d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/profile_helper.rb
View file

@ -10,7 +10,7 @@ module ProfileHelper
end end
def show_profile_social_tab? def show_profile_social_tab?
Gitlab.config.omniauth.enabled && !current_user.ldap_user? enabled_social_providers.any? && !current_user.ldap_user?
end end
def show_profile_remove_tab? def show_profile_remove_tab?