diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-11 15:02:07 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-11 15:02:07 +0000 |
| commit | a599d8120ddf4d9a6f66ff0bfbd024e414f38772 (patch) | |
| tree | ed6df6cbc56a4cbb203804b239b2d1be41260be8 | |
| parent | 7157f79caa88689f1b8989d183ef20fbc942bd0f (diff) | |
| parent | 9818775cad7eec3bdc11a958a876f5fff1f991fb (diff) | |
| download | gitlab-ce-a599d8120ddf4d9a6f66ff0bfbd024e414f38772.tar.gz | |
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 :).
| -rw-r--r-- | app/helpers/profile_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index dd9e03d95a8..297ae83d895 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -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? |