Merge branch 'jej/group-saml-settings-link-checks-license' into 'master'

Group SAML settings link checks license

See merge request gitlab-org/gitlab-ee!6147

ee/app/helpers/ee/saml_providers_helper.rb

 module EE
   module SamlProvidersHelper
-    def group_saml_enabled?
+    def group_saml_configured?
       ::Gitlab::Auth::GroupSaml::Config.enabled?
     end
 
     def show_saml_in_sidebar?(group)
-      group_saml_enabled? && !group.subgroup? && can?(current_user, :admin_group_saml, group)
+      return false unless group_saml_configured?
+      return false unless group.feature_available?(:group_saml)
+      return false if group.subgroup?
+
+      can?(current_user, :admin_group_saml, group)
     end
 
     def saml_link_for_provider(text, provider, *args)

ee/changelogs/unreleased/jej-group-saml-settings-link-checks-license.yml

+---
+title: Group SAML settings link hidden when unlicensed
+merge_request: 6147
+author:
+type: fixed