Merge branch 'jej/group-saml-metadata-feature-check-fix' into 'master'

Fix GroupSAML metadata feature flag

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

ee/lib/gitlab/auth/group_saml/group_lookup.rb

@@ -13,7 +13,7 @@ module Gitlab
         end
 
         def group
-          Group.find_by_full_path(path)
+          @group ||= Group.find_by_full_path(path)
         end
 
         def saml_provider

ee/lib/omni_auth/strategies/group_saml.rb

@@ -51,7 +51,7 @@ module OmniAuth
       end
 
       def metadata_enabled?
-        Feature.enabled?(:group_saml_metadata_available)
+        Feature.enabled?(:group_saml_metadata_available, group_lookup.group)
       end
 
       def group_lookup

ee/spec/lib/omni_auth/strategies/group_saml_spec.rb

@@ -133,6 +133,15 @@ describe OmniAuth::Strategies::GroupSaml, type: :strategy do
       expect(last_response.status).to eq 404
     end
 
+    it 'suceeds when feature enabled for an individual group' do
+      stub_feature_flags(group_saml_metadata_available: false)
+      allow(Feature).to receive(:enabled?).with(:group_saml_metadata_available, group) { true }
+
+      post '/users/auth/group_saml/metadata', group_path: 'my-group', token: group.saml_discovery_token
+
+      expect(last_response.status).to eq 200
+    end
+
     it 'returns metadata when a valid token is provided' do
       post '/users/auth/group_saml/metadata', group_path: 'my-group', token: group.saml_discovery_token